Changeset: 7f6fd132b49a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f6fd132b49a
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB4-XQuery-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB4-XQuery-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/rules.msc
buildtools/burg/ChangeLog
clients/ChangeLog
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
gdk/ChangeLog
gdk/libbat.rc
java/ChangeLog
monetdb4/monet/libmonet.rc
monetdb5/ChangeLog
monetdb5/tools/libmonetdb5.rc
pathfinder/benchmarks/MBench/Tests/All
pathfinder/benchmarks/XMach-1/Tests/All
pathfinder/benchmarks/XMark/XRpc/Tests/All
pathfinder/runtime/Tests/All
pathfinder/runtime/pathfinder.mx
pathfinder/runtime/xrpc/admin/Tests/All
pathfinder/runtime/xrpc/admin/title.html.in
pathfinder/tests/BugTracker/Tests/All
pathfinder/tests/BugsViaSourceforge/Tests/All
pathfinder/tests/W3C_use_cases/XQ/PARTS/Tests/All
pathfinder/tests/W3C_use_cases/XQ/TREE/Tests/All
pathfinder/tests/W3C_use_cases/XQUF/Parts/Tests/All
pathfinder/tests/WebSite/Tests/All
pathfinder/tests/XQuery/Tests/All
pathfinder/tests/XRpc/Tests/All
sql/ChangeLog
template/configure.ag
tools/merovingian/ChangeLog
vertoo.data
Branch: default
Log Message:
Step two towards a new stable branch "Mar2011".
Increment version numbers.
>From now on, *all* bug fixes, and *only* bug fixes, *must* go to the
stable branch with the name "Mar2011".
diffs (truncated from 519 to 300 lines):
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -573,7 +573,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.0.0"
+ "ProductVersion" = "8:11.2.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff --git a/NT/installer32/MonetDB4-XQuery-Installer.vdproj
b/NT/installer32/MonetDB4-XQuery-Installer.vdproj
--- a/NT/installer32/MonetDB4-XQuery-Installer.vdproj
+++ b/NT/installer32/MonetDB4-XQuery-Installer.vdproj
@@ -4175,7 +4175,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.0.0"
+ "ProductVersion" = "8:11.2.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -432,7 +432,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.0.0"
+ "ProductVersion" = "8:11.2.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -5288,7 +5288,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.0.0"
+ "ProductVersion" = "8:11.2.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -573,7 +573,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.0.0"
+ "ProductVersion" = "8:11.2.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff --git a/NT/installer64/MonetDB4-XQuery-Installer.vdproj
b/NT/installer64/MonetDB4-XQuery-Installer.vdproj
--- a/NT/installer64/MonetDB4-XQuery-Installer.vdproj
+++ b/NT/installer64/MonetDB4-XQuery-Installer.vdproj
@@ -4175,7 +4175,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.0.0"
+ "ProductVersion" = "8:11.2.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -432,7 +432,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.0.0"
+ "ProductVersion" = "8:11.2.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -5288,7 +5288,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.0.0"
+ "ProductVersion" = "8:11.2.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -17,7 +17,7 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-VERSION=11.0.0
+VERSION=11.2.0
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Mar2011
copy from buildtools/ChangeLog
copy to buildtools/ChangeLog.Mar2011
diff --git a/buildtools/burg/ChangeLog b/buildtools/burg/ChangeLog
--- a/buildtools/burg/ChangeLog
+++ b/buildtools/burg/ChangeLog
@@ -1,27 +1,3 @@
This is a modified version of Burg.
The following modifications have been made to ease the
-development of the Pathfinder XQuery compiler project:
-
- -- Added printing of `#line' tags in the generated C code.
- (Eases development process with some development tools.)
-
- -- Made documentation LaTeX2e compliant.
-
- -- Integrated Burg into the Pathfinder build setup. The
- Makefile is now created via autogen/automake/autoconf.
- The original Makefile is available in the file
- `Makefile.orig'.
-
- -- Made Grammar file gram.y bison-compliant: Removed `='
- characters.
-
- -- Several minor changes to make Burg compile on modern
- (and restrictive) compilers. (Added function declarations,
- #includes, etc.)
-
-The original source code of Burg is available via the site
-http://research.microsoft.com/~toddpro/. Please do not
-report bugs related to this modified version to the original
-burg developer, Todd A. Proebsting, but to the Pathfinder
-development team at pathfin...@inf.uni-konstanz.de.
diff --git a/buildtools/burg/ChangeLog b/buildtools/burg/ChangeLog.Mar2011
copy from buildtools/burg/ChangeLog
copy to buildtools/burg/ChangeLog.Mar2011
diff --git a/clients/ChangeLog b/clients/ChangeLog
--- a/clients/ChangeLog
+++ b/clients/ChangeLog
@@ -1,32 +1,3 @@
# ChangeLog file for clients
# This file is updated with Maddlog
-* Mon Jan 24 2011 Fabian Groffen <fab...@cwi.nl>
-- Disable timer functionality for non-XQuery languages since it is
- incorrect, bug #2705
-
-* Tue Jan 4 2011 Fabian Groffen <fab...@cwi.nl>
-- Added mapi_get_uri function to retrieve mapi URI for the connection
-
-* Fri Dec 10 2010 Fabian Groffen <fab...@cwi.nl>
-- Allow to dump table data using INSERT INTO statements, rather than COPY
- INTO + CSV data using the -N/--inserts flag of mclient and msqldump.
- Bug #2727
-
-* Wed Dec 8 2010 Fabian Groffen <fab...@cwi.nl>
-- Added support for \dn to list schemas or describe a specific one
-
-* Thu Nov 25 2010 Fabian Groffen <fab...@cwi.nl>
-- Added support for \df to list functions or describe a specific one
-- Added support for \ds to list sequences or describe a specific one
-
-* Mon Nov 22 2010 Fabian Groffen <fab...@cwi.nl>
-- Added support for wildcards * and ? in object names given to \d
- commands, such that pattern matching is possible, e.g. \d my*
-- Added support for \dS that lists also system tables
-
-* Fri Nov 19 2010 Fabian Groffen <fab...@cwi.nl>
-- object names given to \d are now lowercased, unless quoted by either
- single or double quotes
-- Strip any trailing whitespace with the \d command
-
diff --git a/clients/ChangeLog b/clients/ChangeLog.Mar2011
copy from clients/ChangeLog
copy to clients/ChangeLog.Mar2011
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,0,0,1
- PRODUCTVERSION 11,0,0,1
+ FILEVERSION 11,2,0,1
+ PRODUCTVERSION 11,2,0,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "CWI\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", "11.0.0\0"
+ VALUE "FileVersion", "11.2.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
@@ -28,7 +28,7 @@
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", "11.0.0\0"
+ VALUE "ProductVersion", "11.2.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,0,0,1
- PRODUCTVERSION 11,0,0,1
+ FILEVERSION 11,2,0,1
+ PRODUCTVERSION 11,2,0,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "CWI\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", "11.0.0\0"
+ VALUE "FileVersion", "11.2.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
@@ -28,7 +28,7 @@
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", "11.0.0\0"
+ VALUE "ProductVersion", "11.2.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -62,8 +62,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 11,0,0,1
- PRODUCTVERSION 11,0,0,1
+ FILEVERSION 11,2,0,1
+ PRODUCTVERSION 11,2,0,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -80,12 +80,12 @@
BEGIN
VALUE "CompanyName", "CWI"
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
- VALUE "FileVersion", "11.0.0"
+ VALUE "FileVersion", "11.2.0"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB BV 2008-2011"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", "11.0.0"
+ VALUE "ProductVersion", "11.2.0"
END
END
BLOCK "VarFileInfo"
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,5 +1,3 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
-* Fri Jan 14 2011 Fabian Groffen <fab...@cwi.nl>
-- MonetDB/src/gdk was moved to gdk
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Mar2011
copy from gdk/ChangeLog
copy to gdk/ChangeLog.Mar2011
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,0,0,1
- PRODUCTVERSION 11,0,0,1
+ FILEVERSION 11,2,0,1
+ PRODUCTVERSION 11,2,0,1
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
