Changeset: c68f84513a6a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c68f84513a6a Added Files: sql/test/BugTracker-2014/Tests/uppercaseboolean.Bug-3519.sql sql/test/BugTracker-2014/Tests/uppercaseboolean.Bug-3519.stable.err sql/test/BugTracker-2014/Tests/uppercaseboolean.Bug-3519.stable.out Removed Files: sql/test/Skyserver/Skyserver_dropMath.sql sql/test/Skyserver/Skyserver_dropMs_functions.sql 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.Jan2014 clients/R/MonetDB.R/DESCRIPTION clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py common/stream/stream.c configure.ag debian/changelog gdk/gdk_atoms.c gdk/gdk_logger.c gdk/libbat.rc libversions monetdb5/mal/Tests/tst913.stable.out monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql_statement.c sql/scripts/15_querylog.sql sql/scripts/16_tracelog.sql sql/scripts/22_clients.sql sql/scripts/25_debug.sql sql/scripts/26_sysmon.sql sql/scripts/75_storagemodel.sql sql/scripts/80_statistics.sql sql/scripts/99_system.sql sql/test/BugTracker/Tests/rank_over.SF-1691098.sql sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out sql/test/BugTracker/Tests/with_only_once.SF-1720293.sql sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out sql/test/Skyserver/Skyserver_functions.sql sql/test/Skyserver/Skyserver_functions_v6.sql sql/test/Skyserver/Tests/Skyserver.SQL.py sql/test/Skyserver/Tests/Skyserver_v6.SQL.py sql/test/pg_regress/Tests/date.sql sql/test/pg_regress/Tests/point.sql sql/test/pg_regress/Tests/point.stable.out sql/test/pg_regress/Tests/strings.sql sql/test/pg_regress/Tests/strings.stable.err sql/test/pg_regress/Tests/strings.stable.out sql/test/pg_regress/postgresql2sql99.sh testing/Mtest.py.in vertoo.data Branch: RIntegration-default Log Message:
Merge with default branch. diffs (truncated from 3766 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -567,3 +567,8 @@ 13e1b24f442791f5ab790fa77453d3bd4e88a9c8 c3051f066a9eea814487dfb0b7cf7070ae16cd21 Jan2014_17 13e1b24f442791f5ab790fa77453d3bd4e88a9c8 Jan2014_SP2_release 389f5f0d4c43ab689e31c28e01b43c8b7ba8de9c Jan2014_SP2_release +dc158ade928d0305f3f0e7ef9613dd81329f613d Jan2014_19 +0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release +6830d0b9c31fe23954c75014a581f145c7a551ff Jan2014_21 +0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release +6c7d5f562fcb044b745c871344c25b1c6bab7cf4 Jan2014_SP3_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -45,7 +45,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/Jan2014-SP2/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jan2014-SP3/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -802,6 +802,24 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD rm -fr $RPM_BUILD_ROOT %changelog +* Fri Jul 25 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.21-20140725 +- Rebuilt. +- BZ#3519: Uppercase TRUE/FALSE strings cannot be converted to boolean + values + +* Tue Jul 22 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.19-20140722 +- Rebuilt. +- BZ#3487: dead link to "Professional services" +- BZ#3500: MonetDB driver wants an empty string for SQLTables and + SQLColumns API calls, where other drivers expect NULL +- BZ#3514: mserver5 crash due (assertion failure in gdk_select.c) +- BZ#3515: mserver5 crash due (assertion failure in gdk_bat.c) + +* Tue Jun 3 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.19-20140722 +- buildtools: Fix configure to continue without Python if the python binary is + too old. This instead of always aborting configure if python happens + to be too old. + * Wed May 14 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.17-20140514 - Rebuilt. - BZ#3482: Crossproduct error diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,11 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Jun 3 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.19-20140722 +- Fix configure to continue without Python if the python binary is + too old. This instead of always aborting configure if python happens + to be too old. + * Wed Apr 30 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 - Lots of minor fixes were made for potential defects found by Coverity Scan. diff --git a/buildtools/ChangeLog.Jan2014 b/buildtools/ChangeLog.Jan2014 --- a/buildtools/ChangeLog.Jan2014 +++ b/buildtools/ChangeLog.Jan2014 @@ -1,8 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Tue Jun 3 2014 Sjoerd Mullender <sjo...@acm.org> -- Fix configure to continue without Python if the python binary is - too old. This instead of always aborting configure if python happens - to be too old. - diff --git a/common/stream/stream.c b/common/stream/stream.c --- a/common/stream/stream.c +++ b/common/stream/stream.c @@ -781,6 +781,26 @@ stream_gzread(stream *s, void *buf, size s->errnr = MNSTR_READ_ERROR; return -1; } +#ifdef WIN32 + /* on Windows when in text mode, convert \r\n line + * endings to \n */ + if (s->type == ST_ASCII) { + char *p1, *p2, *pe; + + p1 = buf; + pe = p1 + size; + while (p1 < pe && *p1 != '\r') + p1++; + p2 = p1; + while (p1 < pe) { + if (*p1 == '\r' && p1[1] == '\n') + size--; + else + *p2++ = *p1; + p1++; + } + } +#endif return (ssize_t) (size / elmsize); } return 0; @@ -996,6 +1016,26 @@ stream_bzread(stream *s, void *buf, size s->errnr = MNSTR_READ_ERROR; return -1; } +#ifdef WIN32 + /* on Windows when in text mode, convert \r\n line endings to + * \n */ + if (s->type == ST_ASCII) { + char *p1, *p2, *pe; + + p1 = buf; + pe = p1 + size; + while (p1 < pe && *p1 != '\r') + p1++; + p2 = p1; + while (p1 < pe) { + if (*p1 == '\r' && p1[1] == '\n') + size--; + else + *p2++ = *p1; + p1++; + } + } +#endif return size / elmsize; } diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,42 @@ +monetdb (11.17.21-20140725) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 25 Jul 2014 15:09:55 +0200 + +monetdb (11.17.21-20140725) unstable; urgency=low + + * Rebuilt. + * BZ#3519: Uppercase TRUE/FALSE strings cannot be converted to boolean + values + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 25 Jul 2014 15:09:53 +0200 + +monetdb (11.17.19-20140722) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 22 Jul 2014 11:42:09 +0200 + +monetdb (11.17.19-20140722) unstable; urgency=low + + * Rebuilt. + * BZ#3487: dead link to "Professional services" + * BZ#3500: MonetDB driver wants an empty string for SQLTables and + SQLColumns API calls, where other drivers expect NULL + * BZ#3514: mserver5 crash due (assertion failure in gdk_select.c) + * BZ#3515: mserver5 crash due (assertion failure in gdk_bat.c) + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 22 Jul 2014 11:42:07 +0200 + +monetdb (11.17.19-20140722) unstable; urgency=low + + * buildtools: Fix configure to continue without Python if the python binary is + too old. This instead of always aborting configure if python happens + to be too old. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 3 Jun 2014 11:42:07 +0200 + monetdb (11.17.17-20140514) unstable; urgency=low * Rebuilt. diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c --- a/gdk/gdk_atoms.c +++ b/gdk/gdk_atoms.c @@ -450,9 +450,15 @@ bitFromStr(const char *src, int *len, bi } else if (p[0] == 't' && p[1] == 'r' && p[2] == 'u' && p[3] == 'e') { **dst = TRUE; p += 4; + } else if (p[0] == 'T' && p[1] == 'R' && p[2] == 'U' && p[3] == 'E') { + **dst = TRUE; + p += 4; } else if (p[0] == 'f' && p[1] == 'a' && p[2] == 'l' && p[3] == 's' && p[4] == 'e') { **dst = FALSE; p += 5; + } else if (p[0] == 'F' && p[1] == 'A' && p[2] == 'L' && p[3] == 'S' && p[4] == 'E') { + **dst = FALSE; + p += 5; } else if (p[0] == 'n' && p[1] == 'i' && p[2] == 'l') { p += 3; } else { diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c --- a/gdk/gdk_logger.c +++ b/gdk/gdk_logger.c @@ -1159,160 +1159,13 @@ logger_new(int debug, char *fn, char *lo snprintf(bak, BUFSIZ, "%s_catalog", fn); bid = BBPindex(bak); - /* upgrade from old logger format; all errors are fatal since - * this should only happen on startup */ - if (bid) { - /* split catalog -> catalog_bid, catalog_nme */ - BAT *b = BATdescriptor(bid); - BAT *v; - - if (b == 0) - logger_fatal("Logger_new: inconsistent database, " - "'%s' does not exist",bak,0,0); - lg->catalog_bid = logbat_new(TYPE_int, BATSIZE, PERSISTENT); - lg->catalog_nme = logbat_new(TYPE_str, BATSIZE, PERSISTENT); - - v = BATmark(b, 0); - if (v == NULL) - logger_fatal("Logger_new: cannot create view on bat", - 0, 0, 0); - if (BATappend(lg->catalog_bid, BATmirror(v), FALSE) == NULL) - logger_fatal("Logger_new: BATappend failed", 0, 0, 0); - BBPunfix(v->batCacheid); - v = BATmark(BATmirror(b), 0); - if (v == NULL) - logger_fatal("Logger_new: cannot create view on bat", - 0, 0, 0); - if (BATappend(lg->catalog_nme, BATmirror(v), FALSE) == NULL) - logger_fatal("Logger_new: BATappend failed", 0, 0, 0); - BBPunfix(v->batCacheid); - - /* Make persistent */ - bid = lg->catalog_bid->batCacheid; - BBPincref(bid, TRUE); - snprintf(bak, BUFSIZ, "%s_catalog_bid", fn); - if (BBPrename(lg->catalog_bid->batCacheid, bak) < 0) - logger_fatal("Logger_new: BBPrename to %s failed", - bak, 0, 0); - - /* Make persistent */ - bid = lg->catalog_nme->batCacheid; - BBPincref(bid, TRUE); - snprintf(bak, BUFSIZ, "%s_catalog_nme", fn); - if (BBPrename(lg->catalog_nme->batCacheid, bak) < 0) - logger_fatal("Logger_new: BBPrename to %s failed", - bak, 0, 0); - - logbat_destroy(b); - - /* split snapshots -> snapshots_bid, snapshots_tid */ - bid = logger_find_bat(lg, "snapshots"); - b = BATdescriptor(bid); - if (b == 0) - logger_fatal("Logger_new: inconsistent database, '%s' " - "snapshots does not exist", bak, 0, 0); - - lg->snapshots_bid = logbat_new(TYPE_int, 1, PERSISTENT); - if (lg->snapshots_bid == NULL) - logger_fatal("Logger_new: cannot create snapshot bat", - 0, 0, 0); - v = BATmark(b, 0); - if (v == NULL) - logger_fatal("Logger_new: cannot create view on bat", - 0, 0, 0); - if (BATappend(lg->snapshots_bid, BATmirror(v), FALSE) == NULL) - logger_fatal("Logger_new: BATappend failed", 0, 0, 0); - BBPunfix(v->batCacheid); - snprintf(bak, BUFSIZ, "%s_snapshots_bid", fn); - if (BBPrename(lg->snapshots_bid->batCacheid, bak) < 0) - logger_fatal("Logger_new: BBPrename to %s failed", - bak, 0, 0); - logger_add_bat(lg, lg->snapshots_bid, "snapshots_bid"); - - lg->snapshots_tid = logbat_new(TYPE_int, 1, PERSISTENT); - if (lg->snapshots_tid == NULL) - logger_fatal("Logger_new: cannot create snapshot bat", - 0, 0, 0); - v = BATmark(BATmirror(b), 0); - if (v == NULL) - logger_fatal("Logger_new: cannot create view on bat", - 0, 0, 0); - if (BATappend(lg->snapshots_tid, BATmirror(v), FALSE) == NULL) - logger_fatal("Logger_new: BATappend failed", 0, 0, 0); - BBPunfix(v->batCacheid); - snprintf(bak, BUFSIZ, "%s_snapshots_tid", fn); - if (BBPrename(lg->snapshots_tid->batCacheid, bak) < 0) - logger_fatal("Logger_new: BBPrename to %s failed", - bak, 0, 0); - logger_add_bat(lg, lg->snapshots_tid, "snapshots_tid"); - - logbat_destroy(b); - - /* split seqs -> seqs_id, seqs_val */ - bid = logger_find_bat(lg, "seqs"); - b = BATdescriptor(bid); - if (b == 0) - logger_fatal("Logger_new: inconsistent database, '%s' " - "seqs does not exist", bak, 0, 0); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
