Changeset: efeddc1f71c5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=efeddc1f71c5 Modified Files: configure.ag sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.FreeBSD sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out.FreeBSD Branch: jacqueline Log Message:
Merged from default diffs (truncated from 5627 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -469,3 +469,5 @@ 6dbadba38a4635b6319f2ba966f5dde6efab037d 2373eb4ee98b690aa72b86bebf4b2b47c87aa77c Dec2011_5 6dbadba38a4635b6319f2ba966f5dde6efab037d Dec2011_release 32665cf67d03011ff1fcc2c8e118370c47e5fae6 Dec2011_release +d159bb1ba293002773b896353854b14aeb4e5cd1 Dec2011_7 +f47248f30989933b245a4d6f2e31a9e443f1078b Dec2011_SP1_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/Dec2011/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Dec2011-SP1/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -626,6 +626,52 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Fri Feb 24 2012 Fabian Groffen <fab...@monetdb.org> - 11.7.7-20120224 +- Rebuilt. + +* Wed Feb 22 2012 Sjoerd Mullender <sjo...@acm.org> - 11.7.7-20120224 +- buildtools: Fixed some of the package names for Debian/Ubuntu. Packages for + libraries should contain the major number of the library version number. + This was not always the case. + +* Mon Feb 20 2012 Fabian Groffen <fab...@cwi.nl> - 11.7.7-20120224 +- java: Fixed bug in DatabaseMetaData.getSchemas() method that caused an SQL + error when called with catalog and schema argument. + +* Fri Feb 17 2012 Fabian Groffen <fab...@cwi.nl> - 11.7.7-20120224 +- merovingian: Fixed a bug in the multiplex-funnel where certain clients would abort + on responses for update queries. + +* Fri Feb 17 2012 Sjoerd Mullender <sjo...@acm.org> - 11.7.7-20120224 +- sql: Fixed a crash that happened at the end of a database upgrade to the + Dec2011 database scheme. The crash happened during cleanup after the + database was upgraded, so it was merely inconvenient. + +* Wed Feb 15 2012 Sjoerd Mullender <sjo...@acm.org> - 11.7.7-20120224 +- sql: Stripped off implementation-specific parts from error messages before + they get presented to the user. + +* Tue Feb 14 2012 Fabian Groffen <fab...@cwi.nl> - 11.7.7-20120224 +- java: Resolved a bug where JDBC and Control connections could terminate + abruptly with 'Connection closed' messages + +* Thu Feb 9 2012 Sjoerd Mullender <sjo...@acm.org> - 11.7.7-20120224 +- monetdb5: Fixed potential crash by dealing better with non-standard types. + +* Tue Feb 7 2012 Sjoerd Mullender <sjo...@acm.org> - 11.7.7-20120224 +- buildtools: On Debian and Ubuntu, install Python modules in dist-packages instead + of site-packages. This fixed bug 2997. + +* Mon Jan 30 2012 Fabian Groffen <fab...@cwi.nl> - 11.7.7-20120224 +- merovingian: Fixed problem where version and mserver properties for monetdbd were + not always successfully retrieved. Bug #2982. +- merovingian: Fixed problem where shutdown of monetdbd would lead to shutting down + database 'control' which does not exist. Bug #2983. +- merovingian: Fixed issue causing (harmless) 'error reading from control channel' + messages. Bug #2984. +- merovingian: Resolved problem where remote start/stop/etc. commands with monetdb + would report error 'OK'. Bug #2984. + * Fri Jan 20 2012 Sjoerd Mullender <sjo...@acm.org> - 11.7.5-20120120 - Rebuilt. 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 @@ -590,9 +590,6 @@ /* Define to 1 if you have the <time.h> header file. */ #define HAVE_TIME_H 1 -/* Define to 1 if you have the timezone and daylight variables. */ -#define HAVE_TIMEZONE 1 - /* Define to 1 if you have the `trunc' function. */ /* #undef HAVE_TRUNC */ diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,15 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Feb 22 2012 Sjoerd Mullender <sjo...@acm.org> - 11.7.7-20120224 +- Fixed some of the package names for Debian/Ubuntu. Packages for + libraries should contain the major number of the library version number. + This was not always the case. + +* Tue Feb 7 2012 Sjoerd Mullender <sjo...@acm.org> - 11.7.7-20120224 +- On Debian and Ubuntu, install Python modules in dist-packages instead + of site-packages. This fixed bug 2997. + * Sat Aug 6 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.1-20110907 - Fixed Fedora 15 (and presumably later) configuration that uses a tmpfs file system for /var/run. This fixes bug 2850. diff --git a/buildtools/ChangeLog.Dec2011 b/buildtools/ChangeLog.Dec2011 --- a/buildtools/ChangeLog.Dec2011 +++ b/buildtools/ChangeLog.Dec2011 @@ -1,7 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Tue Feb 7 2012 Sjoerd Mullender <sjo...@acm.org> -- On Debian and Ubuntu, install Python modules in dist-packages instead - of site-packages. This fixed bug 2997. - diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c --- a/clients/mapiclient/mclient.c +++ b/clients/mapiclient/mclient.c @@ -1765,6 +1765,7 @@ doFile(Mapi mid, const char *file, int u enum hmyesno hassysfuncs = UNKNOWN; FILE *fp; char *prompt = NULL; + int prepno = 0; (void) save_history; /* not used if no readline */ if (strcmp(file, "-") == 0) { @@ -1962,6 +1963,18 @@ doFile(Mapi mid, const char *file, int u case '\n': case '\0': break; + case 'e': + /* a bit of a hack for prepare/exec + * tests: replace "exec **" with the + * ID of the last prepared + * statement */ + if (mode == SQL && + formatter == TESTformatter && + strncmp(line, "exec **", 7) == 0) { + line[5] = prepno < 10 ? ' ' : prepno / 10 + '0'; + line[6] = prepno % 10 + '0'; + } + break; case '\\': switch (line[1]) { case 'q': @@ -2447,6 +2460,11 @@ doFile(Mapi mid, const char *file, int u } CHECK_RESULT(mid, hdl, buf, continue); + if (mapi_get_querytype(hdl) == Q_PREPARE) { + prepno = mapi_get_tableid(hdl); + assert(prepno < 100); + } + rc = format_result(mid, hdl, interactive); if (rc == MMORE && (line != NULL || mapi_query_done(hdl) != MOK)) @@ -2473,19 +2491,19 @@ doFile(Mapi mid, const char *file, int u static void set_timezone(Mapi mid) { -#ifdef HAVE_TIMEZONE -#ifdef _MSC_VER -#define timezone _timezone -#endif char buf[128]; - struct tm *tm; - time_t t; + time_t t, lt, gt; + struct tm *tmp; long tzone; MapiHdl hdl; + /* figure out our current timezone */ t = time(NULL); - tm = localtime(&t); - tzone = timezone - 3600 * tm->tm_isdst; + tmp = gmtime(&t); + gt = mktime(tmp); + tmp = localtime(&t); + lt = mktime(tmp); + tzone = (long) (gt - lt); if (tzone < 0) snprintf(buf, sizeof(buf), "SET TIME ZONE INTERVAL '+%02ld:%02ld' HOUR TO MINUTE", @@ -2500,9 +2518,6 @@ set_timezone(Mapi mid) return; } mapi_close_handle(hdl); -#else - (void) mid; -#endif } static void usage(const char *prog, int xit) diff --git a/clients/odbc/driver/SQLConnect.c b/clients/odbc/driver/SQLConnect.c --- a/clients/odbc/driver/SQLConnect.c +++ b/clients/odbc/driver/SQLConnect.c @@ -58,19 +58,19 @@ static void set_timezone(Mapi mid) { -#ifdef HAVE_TIMEZONE -#ifdef _MSC_VER -#define timezone _timezone -#define daylight _daylight -#define tzset _tzset -#endif char buf[128]; + time_t t, lt, gt; + struct tm *tmp; long tzone; MapiHdl hdl; - /* timezone and daylight are POSIX-defined variables */ - tzset(); - tzone = timezone - 3600 * daylight; + /* figure out our current timezone */ + t = time(NULL); + tmp = gmtime(&t); + gt = mktime(tmp); + tmp = localtime(&t); + lt = mktime(tmp); + tzone = (long) (gt - lt); if (tzone < 0) snprintf(buf, sizeof(buf), "SET TIME ZONE INTERVAL '+%02ld:%02ld' HOUR TO MINUTE", @@ -81,9 +81,6 @@ set_timezone(Mapi mid) tzone / 3600, (tzone % 3600) / 60); if ((hdl = mapi_query(mid, buf)) != NULL) mapi_close_handle(hdl); -#else - (void) mid; -#endif } static void diff --git a/common/utils/muuid.c b/common/utils/muuid.c --- a/common/utils/muuid.c +++ b/common/utils/muuid.c @@ -35,7 +35,7 @@ char * generateUUID(void) { -#ifdef HAVE_UUID_UUID_H +#ifdef HAVE_UUID # ifdef UUID_PRINTABLE_STRING_LENGTH /* Solaris */ char out[UUID_PRINTABLE_STRING_LENGTH]; diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -2531,16 +2531,6 @@ AH_VERBATIM([__attribute__], #endif ]) -AC_MSG_CHECKING([if you have timezone and daylight variables]) -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <time.h>]], - [[printf("%ld %d\n", timezone, daylight);]])], - AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_TIMEZONE], 1, - [Define to 1 if you have the timezone and daylight variables.]), - AC_MSG_RESULT([no])) - dnl checks for library functions case $host in *-darwin1[[01234]]*) diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,79 @@ +monetdb (11.7.7-20120224) unstable; urgency=low + + * Rebuilt. + + -- Fabian Groffen <fab...@monetdb.org> Fri, 24 Feb 2012 13:06:00 +0100 + +monetdb (11.7.7-20120224) unstable; urgency=low + + * buildtools: Fixed some of the package names for Debian/Ubuntu. Packages for + libraries should contain the major number of the library version number. + This was not always the case. + + -- Sjoerd Mullender <sjo...@acm.org> Wed, 22 Feb 2012 13:05:59 +0100 + +monetdb (11.7.7-20120224) unstable; urgency=low + + * java: Fixed bug in DatabaseMetaData.getSchemas() method that caused an SQL + error when called with catalog and schema argument. + + -- Fabian Groffen <fab...@cwi.nl> Mon, 20 Feb 2012 13:05:59 +0100 + +monetdb (11.7.7-20120224) unstable; urgency=low + + * merovingian: Fixed a bug in the multiplex-funnel where certain clients would abort + on responses for update queries. _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
