Changeset: 4b48fce14494 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b48fce14494 Modified Files: 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 clients/ChangeLog-Archive clients/ChangeLog.Feb2013 clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py configure.ag debian/changelog gdk/ChangeLog-Archive gdk/ChangeLog.Feb2013 gdk/gdk_bbp.c gdk/libbat.rc java/ChangeLog-Archive java/ChangeLog.Feb2013 libversions monetdb5/tools/libmonetdb5.rc vertoo.data Branch: Feb2013_int128 Log Message:
Merge with Feb2013 branch (tag Feb2013_17). diffs (truncated from 757 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,5 +1,5 @@ %define name MonetDB -%define version 11.15.16 +%define version 11.15.17 %{!?buildno: %define buildno %(date +%Y%m%d)} # groups of related archs @@ -27,7 +27,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Feb2013-SP4/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Feb2013-SP5/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -726,6 +726,41 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Tue Oct 08 2013 Hannes Muehleisen <han...@cwi.nl> - 11.15.17-20131008 +- Rebuilt. +- BZ#3323: Heapcache bugs/performance issues +- BZ#3331: SAMPLE will return same result every time. +- BZ#3356: DatabaseMetaData.getColumns() doesn't work correctly when + using index-based getters +- BZ#3367: Fully qualified order by column gives "relational query + without result" +- BZ#3368: BAT sortedness info ignored on ORDER BY and TOPN +- BZ#3370: SQL environment settings are updated even when the set + statement fails +- BZ#3373: Setting table to read-only (Bug 3362) fails on big-endian +- BZ#3375: LIKE join: BATfetchjoin does not hit always +- BZ#3376: COPY INTO fails with HEAPextend: failed to extend: MT_mremap() + failed +- BZ#3377: Query interfering with next query in same transaction, + after SP4 +- BZ#3380: Python DBAPI driver throws exception when fetching EXPLAIN + results +- BZ#3381: Windows ODBC driver hangs or crashes on simple queries + +* Mon Oct 7 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.17-20131008 +- java: Rearranged order of returned columns of certain metadata functions to + comply with the JDBC documentation. See bug 3356. + +* Fri Oct 4 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.17-20131008 +- clients: ODBC: Implemented retrieving variable-length data in parts with + SQLGetData. See bug 3381. + +* Mon Sep 30 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.17-20131008 +- gdk: Removed the heap cache. Since the fix for bug 3323 which made that + the cache was actually getting used, bug 3376 made clear that it didn't + work very well. In addition, on Linux at least, the heap cache slows + things down. + * Wed Sep 25 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.15-20130925 - 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:{B6D5A004-B7A3-4AAA-8EDF-B82A30E3410B}" - "PackageCode" = "8:{B9ADE21D-2BE7-4024-85D0-81E3A2E8F5B7}" + "ProductCode" = "8:{BD8AB041-6B72-40CF-AFF9-A32215778D85}" + "PackageCode" = "8:{D1DBE7A6-59FD-44AC-BF72-48588CA27D67}" "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.15.16" + "ProductVersion" = "8:11.15.17" "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:{2EC75CFD-D5FB-48A8-80BD-ABDAAF6B716E}" - "PackageCode" = "8:{6D6A230C-7C5B-46F3-A468-4CBB72A7193D}" + "ProductCode" = "8:{76DF6F18-D91A-4B56-8A20-EB29FC5FA274}" + "PackageCode" = "8:{07FC95D0-56E1-4BEF-A28C-2A1664CD5EA1}" "UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.15.16" + "ProductVersion" = "8:11.15.17" "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 @@ -2329,7 +2329,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.16\\dump-restore.txt" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.17\\dump-restore.txt" "TargetName" = "8:dump-restore.txt" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -2969,7 +2969,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.16\\dump-restore.html" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.17\\dump-restore.html" "TargetName" = "8:dump-restore.html" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -4173,7 +4173,7 @@ { "{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37" { - "Name" = "8:MonetDB-SQL-11.15.16" + "Name" = "8:MonetDB-SQL-11.15.17" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" @@ -4215,15 +4215,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5" - "ProductCode" = "8:{753A7C91-6C61-423F-8569-4825EC12E762}" - "PackageCode" = "8:{D395CC72-87D6-4B1E-A3DA-53303EBC992B}" + "ProductCode" = "8:{FA204B06-519B-45B7-B56B-D297E0E7D610}" + "PackageCode" = "8:{4F3A7F0C-D216-4036-80E4-51C6112DD452}" "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.15.16" + "ProductVersion" = "8:11.15.17" "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:{F4E63BE3-AABF-4346-97A4-39C613C0267C}" - "PackageCode" = "8:{CF751BE0-6B26-4835-A40E-4D31696B57FD}" + "ProductCode" = "8:{F42290C7-3A54-4427-969A-99713117DFF6}" + "PackageCode" = "8:{3E054FB8-A2D3-4A0F-822B-8416CFCBEB5D}" "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.15.16" + "ProductVersion" = "8:11.15.17" "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:{47B2EEA5-08C4-4C0A-A667-2394AC78865C}" - "PackageCode" = "8:{60E82708-6F1F-487C-A572-25AC9FC41D37}" + "ProductCode" = "8:{457A7FC2-0A7A-4B77-A5DD-E74F98D6CF94}" + "PackageCode" = "8:{14C14CD9-5621-4703-BB88-4B37425DFFA8}" "UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.15.16" + "ProductVersion" = "8:11.15.17" "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 @@ -2149,7 +2149,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.16\\dump-restore.txt" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.17\\dump-restore.txt" "TargetName" = "8:dump-restore.txt" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -3049,7 +3049,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.16\\dump-restore.html" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.17\\dump-restore.html" "TargetName" = "8:dump-restore.html" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -4173,7 +4173,7 @@ { "{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37" { - "Name" = "8:MonetDB-SQL-11.15.16" + "Name" = "8:MonetDB-SQL-11.15.17" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" @@ -4215,15 +4215,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5" - "ProductCode" = "8:{2B0B24EC-0376-43BF-B3DB-7DC54A637DBC}" - "PackageCode" = "8:{90DD49DD-B591-4352-BE84-9CD6FCA9E080}" + "ProductCode" = "8:{9285DB28-D675-4837-9EB9-ABFBF17DEADD}" + "PackageCode" = "8:{25794837-380E-41BB-9B4A-B8D681ED762F}" "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.15.16" + "ProductVersion" = "8:11.15.17" "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 @@ -724,7 +724,7 @@ #define MONETDB5_PASSWDHASH "SHA512" /* Release name or "unreleased" */ -#define MONETDB_RELEASE "unreleased" +#define MONETDB_RELEASE "Feb2013-SP5" /* Define if the oid type should use 32 bits on a 64-bit architecture */ /* #undef MONET_OID32 */ @@ -745,13 +745,13 @@ #define PACKAGE_NAME "MonetDB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "MonetDB 11.15.16" +#define PACKAGE_STRING "MonetDB 11.15.17" /* 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.15.16" +#define PACKAGE_VERSION "11.15.17" /* Define to the home page for this package. */ #define PACKAGE_URL "" 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-2013 MonetDB B.V. # All Rights Reserved. -VERSION=11.15.16 +VERSION=11.15.17 # ^^^^^^ # Maintained via vertoo. Please don't modify by hand! # Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Fri Oct 4 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.17-20131008 +- ODBC: Implemented retrieving variable-length data in parts with + SQLGetData. See bug 3381. + * Sat Dec 1 2012 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212 - Mapi protocol v8 support was removed from all client drivers. Protocol v8 has not been used by the servers any more since Apr2012 release diff --git a/clients/ChangeLog.Feb2013 b/clients/ChangeLog.Feb2013 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list