Changeset: 5f8b3b18fb4c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f8b3b18fb4c
Added Files:
debian/libmonetdb6.install
Removed Files:
buildtools/ChangeLog.Apr2012
clients/ChangeLog.Apr2012
debian/libmonetdb4.install
gdk/ChangeLog.Apr2012
geom/ChangeLog.Apr2012
java/ChangeLog.Apr2012
monetdb5/ChangeLog.Apr2012
sql/ChangeLog.Apr2012
testing/ChangeLog.Apr2012
tools/merovingian/ChangeLog.Apr2012
Modified Files:
.hgtags
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jul2012
clients/ChangeLog-Archive
clients/ChangeLog.Jul2012
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python/setup.py
configure.ag
debian/changelog
debian/control
gdk/ChangeLog-Archive
gdk/ChangeLog.Jul2012
gdk/libbat.rc
libversions
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Jul2012
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog-Archive
sql/ChangeLog.Jul2012
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Jul2012
vertoo.data
Branch: Jul2012
Log Message:
merging
diffs (truncated from 864 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -484,3 +484,5 @@ ebb4a17093e63a199a1d5d27855aa8a31c7e7785
06c3e1846c2fc399d72edcac1ed0d877934fab67 Jun2012_root
94ffb491c3f2a9dc47c1371760b928bb7d35c050 Apr2012_7
95df797091e0a19c18771378f80eb8652742b062 Apr2012_SP2_release
+99c533046fba872cd4c23cf9a64a0e54d61f6bae Jul2012_1
+6cc0a74a5518ce234159fadebcc82976165a5200 Jul2012_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.11.0
+%define version 11.11.2
%{!?buildno: %define buildno %(date +%Y%m%d)}
# groups of related archs
@@ -27,7 +27,7 @@ Vendor: MonetDB BV <[email protected]>
Group: Applications/Databases
License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
URL: http://www.monetdb.org/
-Source:
http://dev.monetdb.org/downloads/sources/Apr2012-SP2/%{name}-%{version}.tar.bz2
+Source:
http://dev.monetdb.org/downloads/sources/Jul2012/%{name}-%{version}.tar.bz2
BuildRequires: bison
BuildRequires: bzip2-devel
@@ -679,6 +679,48 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Fri Jul 06 2012 Fabian Groffen <[email protected]> - 11.11.1-20120706
+- Rebuilt.
+
+* Mon Jul 2 2012 Sjoerd Mullender <[email protected]> - 11.11.1-20120706
+- buildtools: Created seperate RPM and DEB packages for MonetDB/JAQL.
+
+* Fri Jun 29 2012 Fabian Groffen <[email protected]> - 11.11.1-20120706
+- sql: COPY INTO now accepts optional parenthesis for file argument.
+ Binary COPY INTO now requires 'COPY BINARY INTO'.
+
+* Fri Jun 29 2012 Sjoerd Mullender <[email protected]> - 11.11.1-20120706
+- clients: ODBC: Fixed a bug where SQLNativeSql expected a statment handle
instead
+ of a connection handle.
+
+* Thu Jun 14 2012 Fabian Groffen <[email protected]> - 11.11.1-20120706
+- monetdb5: Crackers code has been removed. Development continues in the
holindex
+ branch.
+
+* Wed Jun 13 2012 Fabian Groffen <[email protected]> - 11.11.1-20120706
+- merovingian: Removed erroneously (re-)added master and slave properties, this
+ functionality is currently not working.
+
+* Thu Jun 7 2012 Sjoerd Mullender <[email protected]> - 11.11.1-20120706
+- buildtools: Removed --enable-bits option from configure.
+
+* Thu Jun 7 2012 Sjoerd Mullender <[email protected]> - 11.11.1-20120706
+- buildtools: Split the MonetDB-client-ruby RPM package into two and named
them in
+ accordance with the Fedora packaging guidelines as rubygem-<gem-name>.
+
+* Thu Jun 7 2012 Sjoerd Mullender <[email protected]> - 11.11.1-20120706
+- gdk: The sorted property, which was used to maintain whether a column in
+ a BAT was sorted or reverse sorted, has been replaced by a pair of
+ properties, sorted and revsorted. These new properties can be set
+ independently (unlike the old sorted property), and so if both are set,
+ the column must be constant. In addition, internal property checking
+ has been overhauled. Now, when a property is set incorrectly, and
+ when assertions are enabled, an assertion will go off. There is also
+ a function which can derive properties.
+
+* Thu Jun 7 2012 Sjoerd Mullender <[email protected]> - 11.11.1-20120706
+- gdk: Implemented proper overflow checking on all arithmetic operations.
+
* Thu Jun 07 2012 Sjoerd Mullender <[email protected]> - 11.9.7-20120607
- Rebuilt.
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
@@ -566,15 +566,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{4E161B98-9FC8-4512-97D8-EA76C354DA4D}"
- "PackageCode" = "8:{D7B51DE5-F620-464F-89E1-5DE3D9103AB2}"
+ "ProductCode" = "8:{DB40D518-7433-46EC-8A02-5F90DA0AFE22}"
+ "PackageCode" = "8:{24777F35-55AD-4F0F-8AD2-082A6765D7CB}"
"UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.11.0"
+ "ProductVersion" = "8:11.11.2"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -425,14 +425,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5 SQL GIS Module"
- "ProductCode" = "8:{A61BE52A-99A2-4503-BB5B-3837B0708862}"
- "PackageCode" = "8:{5F8AB146-C5BB-4961-95DE-9848D2AF533A}"
+ "ProductCode" = "8:{013B9F91-3915-4C1F-9A83-D243BDC49C1A}"
+ "PackageCode" = "8:{0F437A51-90C5-43B4-B0B9-D7F941687304}"
"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.11.0"
+ "ProductVersion" = "8:11.11.2"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -2893,7 +2893,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.11.0\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.11.2\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3733,7 +3733,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.11.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.11.2\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5317,7 +5317,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.11.0"
+ "Name" = "8:MonetDB-SQL-11.11.2"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5359,15 +5359,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}"
- "PackageCode" = "8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}"
+ "ProductCode" = "8:{78A3FC93-131F-4A37-9957-3F7B9401D87F}"
+ "PackageCode" = "8:{477ABD91-6CA5-4DF6-9B0F-8E6BF19D575F}"
"UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.11.0"
+ "ProductVersion" = "8:11.11.2"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -566,15 +566,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{0DD096EA-A791-4D97-AD3C-5EC69F2A495E}"
- "PackageCode" = "8:{B6C87B73-7277-46B8-B443-65665B5A634C}"
+ "ProductCode" = "8:{4E1FBDFF-4B2D-4CF0-9F15-549F3884A142}"
+ "PackageCode" = "8:{F07CA644-63C1-4E50-8FAB-BF472F4810BB}"
"UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.11.0"
+ "ProductVersion" = "8:11.11.2"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -425,14 +425,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5 SQL GIS Module"
- "ProductCode" = "8:{BD1A3C71-3A8E-421D-922D-2B7A19926B5C}"
- "PackageCode" = "8:{471DD1DA-9C69-4289-821D-4CC329A8BA94}"
+ "ProductCode" = "8:{7AD290AE-83F2-4231-B429-512A1CF3C037}"
+ "PackageCode" = "8:{9D8D8A61-97D2-485A-8A3C-F45058D55667}"
"UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.11.0"
+ "ProductVersion" = "8:11.11.2"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -2853,7 +2853,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.11.0\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.11.2\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3913,7 +3913,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.11.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.11.2\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5317,7 +5317,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.11.0"
+ "Name" = "8:MonetDB-SQL-11.11.2"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5359,15 +5359,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{ACC32EDD-13CE-4079-A6E7-D9DD94DA42EE}"
- "PackageCode" = "8:{332EB6D8-73DD-48CA-83E7-BB1922FFE3BD}"
+ "ProductCode" = "8:{57DD047C-7058-479B-B589-17BF0DA6A652}"
+ "PackageCode" = "8:{8A2B4A73-5626-47DF-AD83-7CF1DEEA6A3B}"
"UpgradeCode" = "8:{839D3C90-B578-41E2-A004-431440F9E899}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.11.0"
+ "ProductVersion" = "8:11.11.2"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -725,13 +725,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.11.0"
+#define PACKAGE_STRING "MonetDB 11.11.2"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "MonetDB"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.11.0"
+#define PACKAGE_VERSION "11.11.2"
/* Path separator */
#define PATH_SEP ';'
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-2012 MonetDB B.V.
# All Rights Reserved.
-VERSION=11.11.0
+VERSION=11.11.2
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,16 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Mon Jul 2 2012 Sjoerd Mullender <[email protected]> - 11.11.1-20120706
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
