Changeset: 08c1e3ed1114 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=08c1e3ed1114 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/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python/setup.py configure.ag gdk/libbat.rc monetdb5/tools/libmonetdb5.rc vertoo.data Branch: default Log Message:
Merge with Dec2011 branch. diffs (truncated from 1429 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -454,3 +454,5 @@ 17d6b84121f74b9d5c53c941086638d7ad89f425 14dbc738956131370f68180da3287b8bfa72e16b Aug2011_3 1162545f10ce1c7b9f1954b26222556eccd12e65 Aug2011_SP1_release 7cd3f2a92ef77ccabd7ab3259887d0ae301be654 Dec2011_root +2355808f3ea00ae69994e2fc7541661fc612b18b Aug2011_5 +477cc2a87348df99b4eab237501d1113e5cb21d8 Aug2011_SP2_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/Aug2011-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Aug2011-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -625,6 +625,55 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Tue Oct 18 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.5-20111018 +- Rebuilt. + +* Mon Oct 17 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018 +- clients: Small improvement to mclient's table rendering for tables without + any rows. Previously, the column names in the header could be + squeezed to very small widths, degrading readability. + +* Wed Oct 12 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018 +- clients: Python DB API connect() function now supports PEP 249-style arguments + user and host, bug #2901 + +* Wed Oct 12 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.5-20111018 +- clients: mclient now checks the result of encoding conversions using the iconv + library. + +* Mon Oct 10 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.5-20111018 +- clients: Fixed a source of crashes in mclient when a query on the command line + using the -s option is combined with input on standard input (e.g. in + the construct mclient -s 'COPY INTO t FROM STDIN ...' < file.csv). + +* Sun Oct 9 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018 +- merovingian: Resolved problem where monetdbd would terminate abnormally when + databases named 'control', 'discovery' or 'merovingian' were stopped. + +* Fri Oct 7 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018 +- merovingian: monetdbd get status now also reports the version of the running monetdbd + +* Fri Oct 7 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.5-20111018 +- clients: Fixed bug 2897 where slow (network) reads could cause blocks to not + be fully read in one go, causing errors in the subsequent use of + those blocks. With thanks to Rémy Chibois. + +* Thu Oct 6 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018 +- merovingian: Improved response time of 'monetdb start' when the database fails + to start. + +* Wed Oct 5 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018 +- merovingian: Fixed a bug in monetdbd where starting a failing database could + incorrectly be reported as a 'running but dead' database. + +* Fri Sep 30 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018 +- merovingian: To avoid confusion, all occurrences of merovingian were changed into + monetdbd for error messages sent to a client. + +* Tue Sep 27 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018 +- clients: Fixed a bug in mclient where processing queries from files could result + in ghost empty results to be reported in the output + * Sun Sep 25 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.3-20110925 - Rebuilt. diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,33 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Mon Oct 17 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018 +- Small improvement to mclient's table rendering for tables without + any rows. Previously, the column names in the header could be + squeezed to very small widths, degrading readability. + +* Wed Oct 12 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018 +- Python DB API connect() function now supports PEP 249-style arguments + user and host, bug #2901 + +* Wed Oct 12 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.5-20111018 +- mclient now checks the result of encoding conversions using the iconv + library. + +* Mon Oct 10 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.5-20111018 +- Fixed a source of crashes in mclient when a query on the command line + using the -s option is combined with input on standard input (e.g. in + the construct mclient -s 'COPY INTO t FROM STDIN ...' < file.csv). + +* Fri Oct 7 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.5-20111018 +- Fixed bug 2897 where slow (network) reads could cause blocks to not + be fully read in one go, causing errors in the subsequent use of + those blocks. With thanks to Rémy Chibois. + +* Tue Sep 27 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018 +- Fixed a bug in mclient where processing queries from files could result + in ghost empty results to be reported in the output + * Fri Sep 23 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.3-20110925 - Fixed Perl DBD rowcount for larger results, bug #2889 diff --git a/clients/ChangeLog.Aug2011 b/clients/ChangeLog.Aug2011 --- a/clients/ChangeLog.Aug2011 +++ b/clients/ChangeLog.Aug2011 @@ -1,30 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Mon Oct 17 2011 Fabian Groffen <fab...@cwi.nl> -- Small improvement to mclient's table rendering for tables without - any rows. Previously, the column names in the header could be - squeezed to very small widths, degrading readability. - -* Wed Oct 12 2011 Fabian Groffen <fab...@cwi.nl> -- Python DB API connect() function now supports PEP 249-style arguments - user and host, bug #2901 - -* Wed Oct 12 2011 Sjoerd Mullender <sjo...@acm.org> -- mclient now checks the result of encoding conversions using the iconv - library. - -* Mon Oct 10 2011 Sjoerd Mullender <sjo...@acm.org> -- Fixed a source of crashes in mclient when a query on the command line - using the -s option is combined with input on standard input (e.g. in - the construct mclient -s 'COPY INTO t FROM STDIN ...' < file.csv). - -* Fri Oct 7 2011 Sjoerd Mullender <sjo...@acm.org> -- Fixed bug 2897 where slow (network) reads could cause blocks to not - be fully read in one go, causing errors in the subsequent use of - those blocks. With thanks to Rémy Chibois. - -* Tue Sep 27 2011 Fabian Groffen <fab...@cwi.nl> -- Fixed a bug in mclient where processing queries from files could result - in ghost empty results to be reported in the output - diff --git a/clients/Tests/exports.timeout b/clients/Tests/exports.timeout --- a/clients/Tests/exports.timeout +++ b/clients/Tests/exports.timeout @@ -1,1 +1,1 @@ -7 +8 diff --git a/clients/odbc/driver/SQLTables.c b/clients/odbc/driver/SQLTables.c --- a/clients/odbc/driver/SQLTables.c +++ b/clients/odbc/driver/SQLTables.c @@ -189,7 +189,7 @@ SQLTables_(ODBCStmt *stmt, char buf[17]; /* the longest string is "GLOBAL TEMPORARY" */ int i, j; - strcpy(query_end, " and (1 = 0"); + strcpy(query_end, " and ("); query_end += strlen(query_end); for (i = j = 0; i < NameLength4 + 1; i++) { if (i == NameLength4 || TableType[i] == ',') { @@ -199,20 +199,28 @@ SQLTables_(ODBCStmt *stmt, } buf[j] = 0; if (strcmp(buf, "VIEW") == 0) - strcpy(query_end, " or t.\"type\" = 1"); + strcpy(query_end, "t.\"type\" = 1 or "); else if (strcmp(buf, "TABLE") == 0) - strcpy(query_end, " or (t.\"type\" = 0 and t.\"system\" = false and t.\"temporary\" = 0)"); + strcpy(query_end, "(t.\"type\" = 0 and t.\"system\" = false and t.\"temporary\" = 0) or "); else if (strcmp(buf, "SYSTEM TABLE") == 0) - strcpy(query_end, " or (t.\"type\" = 0 and t.\"system\" = true and t.\"temporary\" = 0)"); + strcpy(query_end, "(t.\"type\" = 0 and t.\"system\" = true and t.\"temporary\" = 0) or "); else if (strcmp(buf, "LOCAL TEMPORARY") == 0) - strcpy(query_end, " or (t.\"type\" = 0 and t.\"system\" = false and t.\"temporary\" = 1)"); + strcpy(query_end, "(t.\"type\" = 0 and t.\"system\" = false and t.\"temporary\" = 1) or "); query_end += strlen(query_end); j = 0; } else if (j < 17 && TableType[i] != '\'' && (j > 0 || TableType[i] != ' ')) buf[j++] = TableType[i]; } - strcpy(query_end, ")"); - query_end += strlen(query_end); + if (query_end[-1] == '(') { + /* no extra tests added, so remove " and (" */ + query_end -= 6; + *query_end = 0; + } else { + /* remove extra " or " at end */ + query_end -= 4; + *query_end++ = ')'; + *query_end = 0; + } } /* add the ordering */ diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,88 @@ +monetdb (11.5.5-20111018) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 18 Oct 2011 09:33:46 +0200 + +monetdb (11.5.5-20111018) unstable; urgency=low + + * clients: Small improvement to mclient's table rendering for tables without + any rows. Previously, the column names in the header could be + squeezed to very small widths, degrading readability. + + -- Fabian Groffen <fab...@cwi.nl> Mon, 17 Oct 2011 09:33:45 +0200 + +monetdb (11.5.5-20111018) unstable; urgency=low + + * clients: Python DB API connect() function now supports PEP 249-style arguments + user and host, bug #2901 + + -- Fabian Groffen <fab...@cwi.nl> Wed, 12 Oct 2011 09:33:45 +0200 + +monetdb (11.5.5-20111018) unstable; urgency=low + + * clients: mclient now checks the result of encoding conversions using the iconv + library. + + -- Sjoerd Mullender <sjo...@acm.org> Wed, 12 Oct 2011 09:33:45 +0200 + +monetdb (11.5.5-20111018) unstable; urgency=low + + * clients: Fixed a source of crashes in mclient when a query on the command line + using the -s option is combined with input on standard input (e.g. in + the construct mclient -s 'COPY INTO t FROM STDIN ...' < file.csv). + + -- Sjoerd Mullender <sjo...@acm.org> Mon, 10 Oct 2011 09:33:45 +0200 + +monetdb (11.5.5-20111018) unstable; urgency=low + + * merovingian: Resolved problem where monetdbd would terminate abnormally when + databases named 'control', 'discovery' or 'merovingian' were stopped. + + -- Fabian Groffen <fab...@cwi.nl> Sun, 9 Oct 2011 09:33:45 +0200 + +monetdb (11.5.5-20111018) unstable; urgency=low + + * merovingian: monetdbd get status now also reports the version of the running monetdbd + + -- Fabian Groffen <fab...@cwi.nl> Fri, 7 Oct 2011 09:33:45 +0200 + +monetdb (11.5.5-20111018) unstable; urgency=low + + * clients: Fixed bug 2897 where slow (network) reads could cause blocks to not + be fully read in one go, causing errors in the subsequent use of + those blocks. With thanks to Rémy Chibois. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 7 Oct 2011 09:33:45 +0200 + +monetdb (11.5.5-20111018) unstable; urgency=low + + * merovingian: Improved response time of 'monetdb start' when the database fails + to start. + + -- Fabian Groffen <fab...@cwi.nl> Thu, 6 Oct 2011 09:33:45 +0200 + +monetdb (11.5.5-20111018) unstable; urgency=low + + * merovingian: Fixed a bug in monetdbd where starting a failing database could + incorrectly be reported as a 'running but dead' database. + + -- Fabian Groffen <fab...@cwi.nl> Wed, 5 Oct 2011 09:33:45 +0200 + +monetdb (11.5.5-20111018) unstable; urgency=low + + * merovingian: To avoid confusion, all occurrences of merovingian were changed into + monetdbd for error messages sent to a client. + + -- Fabian Groffen <fab...@cwi.nl> Fri, 30 Sep 2011 09:33:45 +0200 + +monetdb (11.5.5-20111018) unstable; urgency=low + + * clients: Fixed a bug in mclient where processing queries from files could result + in ghost empty results to be reported in the output + + -- Fabian Groffen <fab...@cwi.nl> Tue, 27 Sep 2011 09:33:45 +0200 + monetdb (11.5.3-20110925) unstable; urgency=low * Rebuilt. diff --git a/gdk/gdk_atoms.mx b/gdk/gdk_atoms.mx --- a/gdk/gdk_atoms.mx +++ b/gdk/gdk_atoms.mx @@ -1577,13 +1577,15 @@ dblFromStr(char *src, int *len, dbl **ds **dst = dbl_nil; p += 3; } else { _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
