Changeset: be79866c5b58 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be79866c5b58
Modified Files:
MonetDB/ChangeLog
MonetDB/ChangeLog.Oct2010
MonetDB/MonetDB.spec
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
MonetDB/NT/rules.msc
MonetDB/configure.ag
MonetDB/src/gdk/libbat.rc
MonetDB/vertoo.data
MonetDB4/ChangeLog
MonetDB4/ChangeLog.Oct2010
MonetDB4/MonetDB-server.spec
MonetDB4/NT/MonetDB.iss
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server.vdproj
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server64.vdproj
MonetDB4/NT/rules.msc
MonetDB4/VERSION
MonetDB4/configure.ag
MonetDB4/src/monet/libmonet.rc
MonetDB4/tests/BugDay_2005-12-19_4.9.3/Tests/All
MonetDB4/vertoo.data
MonetDB5/ChangeLog
MonetDB5/ChangeLog.Oct2010
MonetDB5/MonetDB-server.spec
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
MonetDB5/NT/rules.msc
MonetDB5/VERSION
MonetDB5/configure.ag
MonetDB5/src/mal/libmonetdb5.rc
MonetDB5/vertoo.data
buildtools/ChangeLog
buildtools/ChangeLog.Oct2010
buildtools/conf/MonetDB.m4
buildtools/vertoo.data
clients/ChangeLog
clients/ChangeLog.Oct2010
clients/MonetDB-client.spec
clients/NT/MonetDB-Clients/MonetDB-Clients.vdproj
clients/NT/MonetDB-Clients/MonetDB-Clients64.vdproj
clients/NT/rules.msc
clients/configure.ag
clients/src/mapilib/Mapi.rc
clients/src/odbc/driver/driver.rc
clients/src/odbc/winsetup/setup.rc
clients/vertoo.data
geom/ChangeLog
geom/ChangeLog.Oct2010
geom/MonetDB-geom.spec
geom/NT/rules.msc
geom/configure.ag
geom/vertoo.data
java/ChangeLog
java/ChangeLog.Oct2010
java/configure.ag
java/vertoo.data
pathfinder/ChangeLog
pathfinder/ChangeLog.Oct2010
pathfinder/INSTALL
pathfinder/MonetDB-XQuery.spec
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj
pathfinder/NT/rules.msc
pathfinder/VERSION
pathfinder/benchmarks/MBench/Tests/All
pathfinder/benchmarks/XMach-1/Tests/All
pathfinder/benchmarks/XMark/XRpc/Tests/All
pathfinder/compiler/semantics/tests/typechecking/Tests/All
pathfinder/configure.ag
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/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
pathfinder/vertoo.data
sql/ChangeLog
sql/ChangeLog.Oct2010
sql/MonetDB-SQL.pc.in
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
sql/NT/rules.msc
sql/VERSION
sql/configure.ag
sql/vertoo.data
template/ChangeLog
template/ChangeLog.Oct2010
template/configure.ag
template/vertoo.data
testing/ChangeLog
testing/ChangeLog.Oct2010
testing/MonetDB-testing.spec
testing/NT/rules.msc
testing/configure.ag
testing/vertoo.data
Branch: Oct2010
Log Message:
Step one towards a new stable branch "Oct2010".
Incremented version numbers.
Moved ChangeLog file to ChangeLog.Oct2010.
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 "Oct2010_root".
diffs (truncated from 2251 to 300 lines):
diff -r 58245b75925c -r be79866c5b58 MonetDB/ChangeLog
--- a/MonetDB/ChangeLog Fri Sep 03 13:31:55 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-# ChangeLog file for MonetDB
-# This file is updated with Maddlog
-
diff -r 58245b75925c -r be79866c5b58 MonetDB/ChangeLog.Oct2010
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB/ChangeLog.Oct2010 Fri Sep 03 13:32:15 2010 +0200
@@ -0,0 +1,3 @@
+# ChangeLog file for MonetDB
+# This file is updated with Maddlog
+
diff -r 58245b75925c -r be79866c5b58 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Fri Sep 03 13:31:55 2010 +0200
+++ b/MonetDB/MonetDB.spec Fri Sep 03 13:32:15 2010 +0200
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 1.39.0
+%define version 1.40.0
%{!?buildno: %define buildno %(date +%Y%m%d)}
%define release %{buildno}%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
diff -r 58245b75925c -r be79866c5b58
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Fri Sep 03 13:31:55
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Fri Sep 03 13:32:15
2010 +0200
@@ -550,7 +550,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:1.39.0"
+ "ProductVersion" = "8:1.40.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
@@ -619,7 +619,7 @@
"Condition" = "8:"
"Transitive" = "11:FALSE"
"ValueTypes" = "3:1"
- "Value" = "8:1.39.0"
+ "Value" = "8:1.40.0"
}
}
}
diff -r 58245b75925c -r be79866c5b58
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Fri Sep 03 13:31:55
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Fri Sep 03 13:32:15
2010 +0200
@@ -550,7 +550,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:1.39.0"
+ "ProductVersion" = "8:1.40.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
@@ -619,7 +619,7 @@
"Condition" = "8:"
"Transitive" = "11:FALSE"
"ValueTypes" = "3:1"
- "Value" = "8:1.39.0"
+ "Value" = "8:1.40.0"
}
}
}
diff -r 58245b75925c -r be79866c5b58 MonetDB/NT/rules.msc
--- a/MonetDB/NT/rules.msc Fri Sep 03 13:31:55 2010 +0200
+++ b/MonetDB/NT/rules.msc Fri Sep 03 13:32:15 2010 +0200
@@ -29,7 +29,7 @@
pkg = MonetDB
CONFIG_H=monetdb_config.h
-VERSION=1.39.0
+VERSION=1.40.0
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
diff -r 58245b75925c -r be79866c5b58 MonetDB/configure.ag
--- a/MonetDB/configure.ag Fri Sep 03 13:31:55 2010 +0200
+++ b/MonetDB/configure.ag Fri Sep 03 13:32:15 2010 +0200
@@ -20,7 +20,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.60)
-AC_INIT([MonetDB Common], [1.39.0], [[email protected]], [MonetDB])
+AC_INIT([MonetDB Common], [1.40.0], [[email protected]], [MonetDB])
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
diff -r 58245b75925c -r be79866c5b58 MonetDB/src/gdk/libbat.rc
--- a/MonetDB/src/gdk/libbat.rc Fri Sep 03 13:31:55 2010 +0200
+++ b/MonetDB/src/gdk/libbat.rc Fri Sep 03 13:32:15 2010 +0200
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 1,39,0,1
- PRODUCTVERSION 1,39,0,1
+ FILEVERSION 1,40,0,1
+ PRODUCTVERSION 1,40,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", "1.39.0\0"
+ VALUE "FileVersion", "1.40.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] 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", "1.39.0\0"
+ VALUE "ProductVersion", "1.40.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
diff -r 58245b75925c -r be79866c5b58 MonetDB/vertoo.data
--- a/MonetDB/vertoo.data Fri Sep 03 13:31:55 2010 +0200
+++ b/MonetDB/vertoo.data Fri Sep 03 13:32:15 2010 +0200
@@ -1,1 +1,1 @@
-monetdb = major:1; minor:39; release:0;
\ No newline at end of file
+monetdb = major:1; minor:40; release:0;
\ No newline at end of file
diff -r 58245b75925c -r be79866c5b58 MonetDB4/ChangeLog
--- a/MonetDB4/ChangeLog Fri Sep 03 13:31:55 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-# ChangeLog file for MonetDB4
-# This file is updated with Maddlog
-
diff -r 58245b75925c -r be79866c5b58 MonetDB4/ChangeLog.Oct2010
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB4/ChangeLog.Oct2010 Fri Sep 03 13:32:15 2010 +0200
@@ -0,0 +1,3 @@
+# ChangeLog file for MonetDB4
+# This file is updated with Maddlog
+
diff -r 58245b75925c -r be79866c5b58 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Fri Sep 03 13:31:55 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Fri Sep 03 13:32:15 2010 +0200
@@ -1,5 +1,5 @@
%define name MonetDB4-server
-%define version 4.39.0
+%define version 4.40.0
%{!?buildno: %define buildno %(date +%Y%m%d)}
%define release %{buildno}%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
@@ -45,16 +45,16 @@
%define builddoc 0
-Requires: MonetDB-client >= 1.38
+Requires: MonetDB-client >= 1.40
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
%if !%{?buildsystem}
-BuildRequires: MonetDB-devel >= 1.39
+BuildRequires: MonetDB-devel >= 1.40
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
-BuildRequires: MonetDB-client-devel >= 1.38
+BuildRequires: MonetDB-client-devel >= 1.40
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
@@ -83,11 +83,11 @@
Summary: MonetDB development package
Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
-Requires: MonetDB-devel >= 1.39
+Requires: MonetDB-devel >= 1.40
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
-Requires: MonetDB-client-devel >= 1.38
+Requires: MonetDB-client-devel >= 1.40
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
diff -r 58245b75925c -r be79866c5b58 MonetDB4/NT/MonetDB.iss
--- a/MonetDB4/NT/MonetDB.iss Fri Sep 03 13:31:55 2010 +0200
+++ b/MonetDB4/NT/MonetDB.iss Fri Sep 03 13:32:15 2010 +0200
@@ -1,7 +1,7 @@
[Setup]
AppName=MonetDB
-AppVerName=MonetDB 4.39.0
+AppVerName=MonetDB 4.40.0
DefaultDirName={pf}\MonetDB
DefaultGroupName=MonetDB
UninstallDisplayIcon={app}\bin\Mserver.exe
diff -r 58245b75925c -r be79866c5b58
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server.vdproj
--- a/MonetDB4/NT/MonetDB4-Server/MonetDB4-Server.vdproj Fri Sep 03
13:31:55 2010 +0200
+++ b/MonetDB4/NT/MonetDB4-Server/MonetDB4-Server.vdproj Fri Sep 03
13:32:15 2010 +0200
@@ -2794,7 +2794,7 @@
"{836E08B8-0285-4809-BA42-01DB6754A45D}:_1F3E25CDC03543AC89284F562A0351E6"
{
"Name" = "8:CommonVersion"
- "Condition" = "8:COMMONVERSION >= \"1.39.0\""
+ "Condition" = "8:COMMONVERSION >= \"1.40.0\""
"Message" = "8:A newer version of MonetDB-Common is needed."
"InstallUrl" = "8:http://monetdb.cwi.nl/";
}
@@ -2840,7 +2840,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:4.39.0"
+ "ProductVersion" = "8:4.40.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
@@ -2901,7 +2901,7 @@
"Condition" = "8:"
"Transitive" = "11:FALSE"
"ValueTypes" = "3:1"
- "Value" = "8:4.39.0"
+ "Value" = "8:4.40.0"
}
}
}
diff -r 58245b75925c -r be79866c5b58
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server64.vdproj
--- a/MonetDB4/NT/MonetDB4-Server/MonetDB4-Server64.vdproj Fri Sep 03
13:31:55 2010 +0200
+++ b/MonetDB4/NT/MonetDB4-Server/MonetDB4-Server64.vdproj Fri Sep 03
13:32:15 2010 +0200
@@ -2800,7 +2800,7 @@
"{836E08B8-0285-4809-BA42-01DB6754A45D}:_1F3E25CDC03543AC89284F562A0351E6"
{
"Name" = "8:CommonVersion"
- "Condition" = "8:COMMONVERSION >= \"1.39.0\""
+ "Condition" = "8:COMMONVERSION >= \"1.40.0\""
"Message" = "8:A newer version of MonetDB-Common is needed."
"InstallUrl" = "8:http://monetdb.cwi.nl/";
}
@@ -2846,7 +2846,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:4.39.0"
+ "ProductVersion" = "8:4.40.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
@@ -2907,7 +2907,7 @@
"Condition" = "8:"
"Transitive" = "11:FALSE"
"ValueTypes" = "3:1"
- "Value" = "8:4.39.0"
+ "Value" = "8:4.40.0"
}
}
}
diff -r 58245b75925c -r be79866c5b58 MonetDB4/NT/rules.msc
--- a/MonetDB4/NT/rules.msc Fri Sep 03 13:31:55 2010 +0200
+++ b/MonetDB4/NT/rules.msc Fri Sep 03 13:32:15 2010 +0200
@@ -39,7 +39,7 @@
pkg = MonetDB4
CONFIG_H=monetdb4_config.h
-VERSION=4.39.0
+VERSION=4.40.0
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
diff -r 58245b75925c -r be79866c5b58 MonetDB4/VERSION
--- a/MonetDB4/VERSION Fri Sep 03 13:31:55 2010 +0200
+++ b/MonetDB4/VERSION Fri Sep 03 13:32:15 2010 +0200
@@ -1,1 +1,1 @@
-4.39.0
+4.40.0
diff -r 58245b75925c -r be79866c5b58 MonetDB4/configure.ag
--- a/MonetDB4/configure.ag Fri Sep 03 13:31:55 2010 +0200
+++ b/MonetDB4/configure.ag Fri Sep 03 13:32:15 2010 +0200
@@ -19,7 +19,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.60)
-AC_INIT([MonetDB Server], [4.39.0], [[email protected]], [MonetDB4-server])
+AC_INIT([MonetDB Server], [4.40.0], [[email protected]], [MonetDB4-server])
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
@@ -62,7 +62,7 @@
# Check for Monet
-req_monetdb_ver='1.39.0'
+req_monetdb_ver='1.40.0'
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
@@ -74,7 +74,7 @@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
