Changeset: a28b1ca0f43c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a28b1ca0f43c
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/ChangeLog
buildtools/ChangeLog.Mar2011
buildtools/burg/ChangeLog
buildtools/burg/ChangeLog.Mar2011
clients/ChangeLog
clients/ChangeLog.Mar2011
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
gdk/ChangeLog
gdk/ChangeLog.Mar2011
gdk/libbat.rc
geom/ChangeLog
geom/ChangeLog.Mar2011
java/ChangeLog
java/ChangeLog.Mar2011
monetdb4/ChangeLog
monetdb4/ChangeLog.Mar2011
monetdb4/monet/libmonet.rc
monetdb5/ChangeLog
monetdb5/ChangeLog.Mar2011
monetdb5/tools/libmonetdb5.rc
pathfinder/ChangeLog
pathfinder/ChangeLog.Mar2011
pathfinder/benchmarks/MBench/Tests/All
pathfinder/benchmarks/XMach-1/Tests/All
pathfinder/benchmarks/XMark/XRpc/Tests/All
pathfinder/compiler/Tests/usageH.stable.out
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
sql/ChangeLog.Mar2011
template/ChangeLog
template/ChangeLog.Mar2011
template/configure.ag
testing/ChangeLog
testing/ChangeLog.Mar2011
tools/merovingian/ChangeLog
tools/merovingian/ChangeLog.Mar2011
vertoo.data
Branch: Mar2011
Log Message:
Step one towards a new stable branch "Mar2011".
Incremented version numbers.
Moved ChangeLog file to ChangeLog.Mar2011.
Disabled XQuery tests that require features that are not supported.
Disabled tests that fail but are not going to be fixed.
Fixed test output for running with assertions disabled.
The root of the stable branch is "Mar2011_root".
diffs (truncated from 787 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.1.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.1.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.1.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.1.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.1.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.1.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.1.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.1.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.1.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
rename from buildtools/ChangeLog
rename to buildtools/ChangeLog.Mar2011
diff --git a/buildtools/burg/ChangeLog b/buildtools/burg/ChangeLog.Mar2011
rename from buildtools/burg/ChangeLog
rename to buildtools/burg/ChangeLog.Mar2011
diff --git a/clients/ChangeLog b/clients/ChangeLog.Mar2011
rename from clients/ChangeLog
rename 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,1,0,1
+ PRODUCTVERSION 11,1,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.1.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.1.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,1,0,1
+ PRODUCTVERSION 11,1,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.1.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.1.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,1,0,1
+ PRODUCTVERSION 11,1,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.1.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.1.0"
END
END
BLOCK "VarFileInfo"
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Mar2011
rename from gdk/ChangeLog
rename 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,1,0,1
+ PRODUCTVERSION 11,1,0,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "CWI\0"
VALUE "FileDescription", "MonetDB Goblin Database Kernel DLL\0"
- VALUE "FileVersion", "11.0.0\0"
+ VALUE "FileVersion", "11.1.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", "libbat.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Common Libraries\0"
- VALUE "ProductVersion", "11.0.0\0"
+ VALUE "ProductVersion", "11.1.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/geom/ChangeLog b/geom/ChangeLog.Mar2011
rename from geom/ChangeLog
rename to geom/ChangeLog.Mar2011
diff --git a/java/ChangeLog b/java/ChangeLog.Mar2011
rename from java/ChangeLog
rename to java/ChangeLog.Mar2011
diff --git a/monetdb4/ChangeLog b/monetdb4/ChangeLog.Mar2011
rename from monetdb4/ChangeLog
rename to monetdb4/ChangeLog.Mar2011
diff --git a/monetdb4/monet/libmonet.rc b/monetdb4/monet/libmonet.rc
--- a/monetdb4/monet/libmonet.rc
+++ b/monetdb4/monet/libmonet.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,1,0,1
+ PRODUCTVERSION 11,1,0,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "CWI\0"
VALUE "FileDescription", "MonetDB4 Library DLL\0"
- VALUE "FileVersion", "11.0.0\0"
+ VALUE "FileVersion", "11.1.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", "libmonet.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB4 Server\0"
- VALUE "ProductVersion", "11.0.0\0"
+ VALUE "ProductVersion", "11.1.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/monetdb5/ChangeLog b/monetdb5/ChangeLog.Mar2011
rename from monetdb5/ChangeLog
rename to monetdb5/ChangeLog.Mar2011
diff --git a/monetdb5/tools/libmonetdb5.rc b/monetdb5/tools/libmonetdb5.rc
--- a/monetdb5/tools/libmonetdb5.rc
+++ b/monetdb5/tools/libmonetdb5.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,1,0,1
+ PRODUCTVERSION 11,1,0,1
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
