Changeset: b21f69fc0677 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b21f69fc0677 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 clients/ChangeLog-Archive clients/ChangeLog.Feb2013 clients/Tests/exports.stable.out clients/mapilib/mapi.rc clients/odbc/driver/SQLParamOptions.c 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/libbat.rc libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Feb2013 monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive sql/ChangeLog.Feb2013 tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Feb2013 vertoo.data Branch: default Log Message:
Merger with default diffs (truncated from 403 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -539,3 +539,5 @@ 89679ea95aac8f548c787cd74c35212137f5b56f 11955d7a07f23672650e41dd0c9fbc9e0fc4c1af Feb2013_SP4_release 4e2a5af00230f6a0e4f51778744c9fcd353a6ba5 Feb2013_17 35b5a0d1fc95cbf151767e6d8e3c01b1e0316c1e Feb2013_SP5_release +2a7d1ac727ae65bb14a6d59bf8beed8ffdde2cd3 Feb2013_19 +09c8c6c3f81fe53b0a38727e676f379715d012cf Feb2013_SP6_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -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-SP5/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Feb2013-SP6/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -755,6 +755,69 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/Maddlog rm -fr $RPM_BUILD_ROOT %changelog +* Wed Nov 20 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.19-20131120 +- Rebuilt. +- BZ#3243: Segmentation fault (possible data corruption) after clean + shutdown +- BZ#3258: Scheduling issues +- BZ#3368: BAT sortedness info ignored on ORDER BY and TOPN +- BZ#3374: UNIQUE constraint does not set tkey property on the + corresponding BAT +- BZ#3382: Response to PREPARE emtpy if query contains a LIMIT +- BZ#3385: Simple query fails with 'identifier not found' +- BZ#3387: mclient does not properly double quote schema names when + using autofill tab +- BZ#3388: case statement in "order by" clause doesn't work when used + together with "group by" +- BZ#3389: median function with "group by" - SIGSEGV +- BZ#3392: ODBC datatype conversion for INTEGER not working properly +- BZ#3394: "Cannot find column type" error in temporary tables in + functions +- BZ#3395: error occurred during a query: "'CASE WHEN" sentence +- BZ#3396: Improper UDF expansion +- BZ#3397: Error in ODBC-Driver when using Prepared Statements +- BZ#3398: Cannot stop monetdbd after erroneously starting an + uninitialized dbfarm + +* Tue Nov 19 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.19-20131120 +- clients: mclient: Fixed a bug where the -H option only worked if the readline + history file already existed. Now we properly create and use the + history file. + +* Tue Nov 19 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.19-20131120 +- gdk: Stopped using the deprecated sbrk() system call. +- gdk: Fixed a problem when reverse sorting a sorted column. +- gdk: Fixed bugs that deal with problems that could possibly occur when + transactions are aborted and the server is restarted. See bug #3243. +- gdk: A bug was fixed in the handling of grouped aggregates when all values + in a group are null. See bug #3388. + +* Tue Nov 19 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.19-20131120 +- monetdb5: Fixed a possible buffer overflow in the COPY INTO code. +- monetdb5: Fixed a problem that when the server is using all available threads + for a query, it was not possible to attach another client and have + it execute even the smallest query. This is fixed by creating extra + threads for each client entering the fray at the cost of having more + threads that execute queries. But at least there is guaranteed progress + for all clients (modulo the operating system scheduler). See bug #3258. + +* Tue Nov 19 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.19-20131120 +- sql: Fixed a bug where the server at some point stopped saving compiled + queries in the SQL query cache. + +* Fri Nov 15 2013 Fabian Groffen <fab...@monetdb.org> - 11.15.19-20131120 +- merovingian: monetdbd(1) now refuses to startup if it cannot read the properties + from the dbfarm, bug #3398 + +* Wed Nov 6 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.19-20131120 +- clients: ODBC: Fixed interpretation SQL_C_SLONG/SQL_C_ULONG/SQL_C_LONG to + refer to a 32 bit integer always (i.e. "int" on 64 bit architectures + despite the name and the Microsoft documentation). This seems to be + the consensus. +- clients: ODBC: Fixed transaction level: MonetDB only supports the highest level + (SQL_TXN_SERIALIZABLE), so setting the transaction level can be accepted + and ignored. + * Tue Oct 08 2013 Hannes Muehleisen <han...@cwi.nl> - 11.15.17-20131008 - Rebuilt. - BZ#3323: Heapcache bugs/performance issues diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,20 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Nov 19 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.19-20131120 +- mclient: Fixed a bug where the -H option only worked if the readline + history file already existed. Now we properly create and use the + history file. + +* Wed Nov 6 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.19-20131120 +- ODBC: Fixed interpretation SQL_C_SLONG/SQL_C_ULONG/SQL_C_LONG to + refer to a 32 bit integer always (i.e. "int" on 64 bit architectures + despite the name and the Microsoft documentation). This seems to be + the consensus. +- ODBC: Fixed transaction level: MonetDB only supports the highest level + (SQL_TXN_SERIALIZABLE), so setting the transaction level can be accepted + and ignored. + * 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. diff --git a/clients/ChangeLog.Feb2013 b/clients/ChangeLog.Feb2013 --- a/clients/ChangeLog.Feb2013 +++ b/clients/ChangeLog.Feb2013 @@ -1,17 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Tue Nov 19 2013 Sjoerd Mullender <sjo...@acm.org> -- mclient: Fixed a bug where the -H option only worked if the readline - history file already existed. Now we properly create and use the - history file. - -* Wed Nov 6 2013 Sjoerd Mullender <sjo...@acm.org> -- ODBC: Fixed interpretation SQL_C_SLONG/SQL_C_ULONG/SQL_C_LONG to - refer to a 32 bit integer always (i.e. "int" on 64 bit architectures - despite the name and the Microsoft documentation). This seems to be - the consensus. -- ODBC: Fixed transaction level: MonetDB only supports the highest level - (SQL_TXN_SERIALIZABLE), so setting the transaction level can be accepted - and ignored. - diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -202,6 +202,7 @@ gdk_return BATsubjoin(BAT **r1p, BAT **r gdk_return BATsubleftfetchjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, int nil_matches, BUN estimate); gdk_return BATsubleftjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, int nil_matches, BUN estimate); gdk_return BATsubouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, int nil_matches, BUN estimate); +gdk_return BATsubrangejoin(BAT **r1p, BAT **r2p, BAT *l, BAT *rl, BAT *rh, BAT *sl, BAT *sr, int li, int hi, BUN estimate); BAT *BATsubselect(BAT *b, BAT *s, const void *tl, const void *th, int li, int hi, int anti); gdk_return BATsubsemijoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, int nil_matches, BUN estimate); gdk_return BATsubsort(BAT **sorted, BAT **order, BAT **groups, BAT *b, BAT *o, BAT *g, int reverse, int stable); @@ -2438,7 +2439,7 @@ InstrPtr copyInstruction(InstrPtr p); MalBlkPtr copyMalBlk(MalBlkPtr mb); void copyProperties(MalBlkPtr mb, int src, int dst); str copyRef; -void copyVariable(MalBlkPtr dst, VarPtr v); +int copyVariable(MalBlkPtr dst, VarPtr v); str copy_fromRef; str countRef; str count_no_nilRef; diff --git a/clients/odbc/driver/SQLParamOptions.c b/clients/odbc/driver/SQLParamOptions.c --- a/clients/odbc/driver/SQLParamOptions.c +++ b/clients/odbc/driver/SQLParamOptions.c @@ -50,7 +50,8 @@ SQLParamOptions(SQLHSTMT StatementHandle #endif /* use mapping as described in ODBC 3 SDK Help file */ - rc = SQLSetStmtAttr_(stmt, SQL_ATTR_PARAMSET_SIZE, &RowNumber, 0); + rc = SQLSetStmtAttr_(stmt, SQL_ATTR_PARAMSET_SIZE, + (SQLPOINTER) (size_t) RowNumber, 0); if (SQL_SUCCEEDED(rc)) { rc = SQLSetStmtAttr_(stmt, SQL_ATTR_PARAMS_PROCESSED_PTR, diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,93 @@ +monetdb (11.15.19-20131120) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Wed, 20 Nov 2013 12:27:16 +0100 + +monetdb (11.15.19-20131120) unstable; urgency=low + + * Rebuilt. + * BZ#3243: Segmentation fault (possible data corruption) after clean + shutdown + * BZ#3258: Scheduling issues + * BZ#3368: BAT sortedness info ignored on ORDER BY and TOPN + * BZ#3374: UNIQUE constraint does not set tkey property on the + corresponding BAT + * BZ#3382: Response to PREPARE emtpy if query contains a LIMIT + * BZ#3385: Simple query fails with 'identifier not found' + * BZ#3387: mclient does not properly double quote schema names when + using autofill tab + * BZ#3388: case statement in "order by" clause doesn't work when used + together with "group by" + * BZ#3389: median function with "group by" - SIGSEGV + * BZ#3392: ODBC datatype conversion for INTEGER not working properly + * BZ#3394: "Cannot find column type" error in temporary tables in + functions + * BZ#3395: error occurred during a query: "'CASE WHEN" sentence + * BZ#3396: Improper UDF expansion + * BZ#3397: Error in ODBC-Driver when using Prepared Statements + * BZ#3398: Cannot stop monetdbd after erroneously starting an + uninitialized dbfarm + + -- Sjoerd Mullender <sjo...@acm.org> Wed, 20 Nov 2013 12:27:15 +0100 + +monetdb (11.15.19-20131120) unstable; urgency=low + + * clients: mclient: Fixed a bug where the -H option only worked if the readline + history file already existed. Now we properly create and use the + history file. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 19 Nov 2013 12:27:15 +0100 + +monetdb (11.15.19-20131120) unstable; urgency=low + + * gdk: Stopped using the deprecated sbrk() system call. + * gdk: Fixed a problem when reverse sorting a sorted column. + * gdk: Fixed bugs that deal with problems that could possibly occur when + transactions are aborted and the server is restarted. See bug #3243. + * gdk: A bug was fixed in the handling of grouped aggregates when all values + in a group are null. See bug #3388. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 19 Nov 2013 12:27:15 +0100 + +monetdb (11.15.19-20131120) unstable; urgency=low + + * monetdb5: Fixed a possible buffer overflow in the COPY INTO code. + * monetdb5: Fixed a problem that when the server is using all available threads + for a query, it was not possible to attach another client and have + it execute even the smallest query. This is fixed by creating extra + threads for each client entering the fray at the cost of having more + threads that execute queries. But at least there is guaranteed progress + for all clients (modulo the operating system scheduler). See bug #3258. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 19 Nov 2013 12:27:15 +0100 + +monetdb (11.15.19-20131120) unstable; urgency=low + + * sql: Fixed a bug where the server at some point stopped saving compiled + queries in the SQL query cache. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 19 Nov 2013 12:27:15 +0100 + +monetdb (11.15.19-20131120) unstable; urgency=low + + * merovingian: monetdbd(1) now refuses to startup if it cannot read the properties + from the dbfarm, bug #3398 + + -- Fabian Groffen <fab...@monetdb.org> Fri, 15 Nov 2013 12:27:15 +0100 + +monetdb (11.15.19-20131120) unstable; urgency=low + + * clients: ODBC: Fixed interpretation SQL_C_SLONG/SQL_C_ULONG/SQL_C_LONG to + refer to a 32 bit integer always (i.e. "int" on 64 bit architectures + despite the name and the Microsoft documentation). This seems to be + the consensus. + * clients: ODBC: Fixed transaction level: MonetDB only supports the highest level + (SQL_TXN_SERIALIZABLE), so setting the transaction level can be accepted + and ignored. + + -- Sjoerd Mullender <sjo...@acm.org> Wed, 6 Nov 2013 12:27:15 +0100 + monetdb (11.15.17-20131008) unstable; urgency=low * Rebuilt. diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -1,6 +1,14 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Nov 19 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.19-20131120 +- Stopped using the deprecated sbrk() system call. +- Fixed a problem when reverse sorting a sorted column. +- Fixed bugs that deal with problems that could possibly occur when + transactions are aborted and the server is restarted. See bug #3243. +- A bug was fixed in the handling of grouped aggregates when all values + in a group are null. See bug #3388. + * Mon Sep 30 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.17-20131008 - 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 diff --git a/gdk/ChangeLog.Feb2013 b/gdk/ChangeLog.Feb2013 --- a/gdk/ChangeLog.Feb2013 +++ b/gdk/ChangeLog.Feb2013 @@ -1,11 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Tue Nov 19 2013 Sjoerd Mullender <sjo...@acm.org> -- Stopped using the deprecated sbrk() system call. -- Fixed a problem when reverse sorting a sorted column. -- Fixed bugs that deal with problems that could possibly occur when - transactions are aborted and the server is restarted. See bug #3243. -- A bug was fixed in the handling of grouped aggregates when all values - in a group are null. See bug #3388. - diff --git a/libversions b/libversions _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
