Changeset: 3fb9882bdda8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3fb9882bdda8 Added Files: sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.stable.err sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.stable.out sql/test/BugTracker-2020/Tests/analyze-stream-table.Bug-6817.sql sql/test/BugTracker-2020/Tests/analyze-stream-table.Bug-6817.stable.err sql/test/BugTracker-2020/Tests/analyze-stream-table.Bug-6817.stable.out sql/test/BugTracker-2020/Tests/select-where-in-rtrim-crash.Bug-6818.sql sql/test/BugTracker-2020/Tests/select-where-in-rtrim-crash.Bug-6818.stable.err sql/test/BugTracker-2020/Tests/select-where-in-rtrim-crash.Bug-6818.stable.out sql/test/mergetables/Tests/mergetable_rel_push_aggr_down.sql sql/test/mergetables/Tests/mergetable_rel_push_aggr_down.stable.err sql/test/mergetables/Tests/mergetable_rel_push_aggr_down.stable.out sql/test/subquery/Tests/subquery4.sql sql/test/subquery/Tests/subquery4.stable.err sql/test/subquery/Tests/subquery4.stable.out Removed Files: sql/benchmarks/xmark-sql/Q1.sql sql/benchmarks/xmark-sql/Q10.sql sql/benchmarks/xmark-sql/Q11.sql sql/benchmarks/xmark-sql/Q12.sql sql/benchmarks/xmark-sql/Q15.sql sql/benchmarks/xmark-sql/Q16.sql sql/benchmarks/xmark-sql/Q17.sql sql/benchmarks/xmark-sql/Q19.sql sql/benchmarks/xmark-sql/Q2.sql sql/benchmarks/xmark-sql/Q20.sql sql/benchmarks/xmark-sql/Q3.sql sql/benchmarks/xmark-sql/Q4.sql sql/benchmarks/xmark-sql/Q5.sql sql/benchmarks/xmark-sql/Q6.sql sql/benchmarks/xmark-sql/Q7.sql sql/benchmarks/xmark-sql/Q8.sql sql/benchmarks/xmark-sql/Q9.sql sql/benchmarks/xmark-sql/load.sql sql/benchmarks/xmark-sql/schema.sql sql/benchmarks/xmark/load.sh sql/benchmarks/xmark/schema.sql sql/benchmarks/xmark/unix.c sql/benchmarks/xmark/xml.sql sql/benchmarks/xmark/xml1.sql sql/benchmarks/xmark/xml10.sql sql/benchmarks/xmark/xml11.sql sql/benchmarks/xmark/xml12.sql sql/benchmarks/xmark/xml15.sql sql/benchmarks/xmark/xml16.sql sql/benchmarks/xmark/xml17.sql sql/benchmarks/xmark/xml19.sql sql/benchmarks/xmark/xml2.sql sql/benchmarks/xmark/xml20.sql sql/benchmarks/xmark/xml3.sql sql/benchmarks/xmark/xml4.sql sql/benchmarks/xmark/xml5.sql sql/benchmarks/xmark/xml6.sql sql/benchmarks/xmark/xml7.sql sql/benchmarks/xmark/xml8.sql sql/benchmarks/xmark/xml9.sql sql/test/BugTracker-2020/Tests/alter-table-add-column-Bug-6816.py sql/test/BugTracker-2020/Tests/alter-table-add-column-Bug-6816.stable.err sql/test/BugTracker-2020/Tests/alter-table-add-column-Bug-6816.stable.out Modified Files: .hgtags MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/mclient.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc common/utils/msabaoth.c common/utils/mstring.h configure.ag debian/changelog gdk/ChangeLog gdk/gdk.h gdk/gdk_bbp.c gdk/gdk_calc_private.h gdk/gdk_cand.c gdk/gdk_private.h gdk/gdk_system_private.h gdk/gdk_tracer.c gdk/gdk_tracer.h gdk/libbat.rc libversions monetdb5/mal/mal_instruction.c monetdb5/mal/mal_private.h monetdb5/modules/mal/tracer.mal monetdb5/modules/mal/wlc.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/wlr.c sql/common/sql_types.c sql/common/sql_types.h sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh sql/jdbc/tests/Tests/Test_CallableStmt.SQL.bat sql/jdbc/tests/Tests/Test_CallableStmt.SQL.sh sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh sql/jdbc/tests/Tests/Test_JdbcClient.stable.err sql/jdbc/tests/Tests/Test_JdbcClient.stable.out sql/rel.txt sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_select.c sql/server/rel_unnest.c sql/server/sql_partition.c sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/sql_storage.h sql/storage/store.c sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.sql sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.err sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.out sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.sql sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.stable.out sql/test/BugTracker-2020/Tests/All sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err sql/test/Dependencies/Tests/dependency_loop.stable.out sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 sql/test/analytics/Tests/analytics00.sql sql/test/analytics/Tests/analytics00.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/merge-partitions/Tests/mergepart01.stable.err sql/test/merge-partitions/Tests/mergepart01.stable.out sql/test/merge-partitions/Tests/mergepart05.stable.err sql/test/merge-partitions/Tests/mergepart07.stable.err sql/test/merge-partitions/Tests/mergepart18.stable.err sql/test/merge-partitions/Tests/mergepart19.stable.err sql/test/mergetables/Tests/All sql/test/mergetables/Tests/addtable.stable.err sql/test/mergetables/Tests/doubletable.stable.err sql/test/mergetables/Tests/sqlsmith-exists2.sql sql/test/mergetables/Tests/sqlsmith-exists2.stable.out sql/test/miscellaneous/Tests/declared_tables.sql sql/test/miscellaneous/Tests/declared_tables.stable.err sql/test/miscellaneous/Tests/declared_tables.stable.out sql/test/subquery/Tests/All sql/test/subquery/Tests/subquery3.sql sql/test/subquery/Tests/subquery3.stable.err sql/test/subquery/Tests/subquery3.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/wlcr/Tests/wlr110.py sql/test/wlcr/Tests/wlr35.py vertoo.data Branch: hitchhiker Log Message:
Merge with default diffs (truncated from 17466 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -750,3 +750,8 @@ e0719bdebf32967ca0a0043f556b3f48f93e0ce0 8d4258444e2a0a809468fb85be7999a407d47e04 Nov2019_9 e0719bdebf32967ca0a0043f556b3f48f93e0ce0 Nov2019_SP1_release 8d4258444e2a0a809468fb85be7999a407d47e04 Nov2019_SP1_release +c35ea84b568b792c5fd073f6a1e1a24372de0e20 Nov2019_11 +c35ea84b568b792c5fd073f6a1e1a24372de0e20 Nov2019_SP2_release +4eb6068f63cf87fc6996daed59fbcc917c8b2881 Nov2019_13 +c35ea84b568b792c5fd073f6a1e1a24372de0e20 Nov2019_SP2_release +4eb6068f63cf87fc6996daed59fbcc917c8b2881 Nov2019_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -105,7 +105,7 @@ Group: Applications/Databases License: MPLv2.0 URL: https://www.monetdb.org/ BugURL: https://bugs.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Nov2019-SP1/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Nov2019-SP2/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist # we need checkpolicy and selinux-policy-devel for the SELinux policy @@ -941,6 +941,18 @@ fi %postun -p /sbin/ldconfig %changelog +* Wed Feb 12 2020 Sjoerd Mullender <sjo...@acm.org> - 11.35.13-20200212 +- Rebuilt. + +* Tue Feb 11 2020 Sjoerd Mullender <sjo...@acm.org> - 11.35.11-20200211 +- Rebuilt. +- BZ#6805: Using the cascade operator in a drop table statement ends in + an exit from the Monetdb shell. +- BZ#6807: Median_avg and quantile_avg ignore NULL values +- BZ#6815: query with ifthenelse() crashes mserver5 +- BZ#6816: Monetdb Crashes on INSERT statement after ALTER statement in + another connection + * Wed Dec 18 2019 Sjoerd Mullender <sjo...@acm.org> - 11.35.9-20191218 - Rebuilt. - BZ#6804: DNS resolution of 0.0.0.0 fails on recent Ubuntus 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 @@ -767,9 +767,6 @@ we just define __attribute__(a) to nothing. */ #define __attribute__(a) -/* Does your compiler support the `__hidden' specifier? */ -#define __hidden - /* function to close a socket */ /* #undef closesocket */ diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -10915,6 +10915,7 @@ stdout of test 'MAL-signatures` in direc [ "lidar", "attach", "pattern lidar.attach(fname:str):void ", "LIDARattach;", "Open a LIDAR file and return catalog of the table HDUs" ] [ "lidar", "export", "pattern lidar.export(tablename:str, fname:str, type:str):void ", "LIDARexportTable;", "Exporta LIDAR table to a LAS/LAZ file" ] [ "lidar", "load", "pattern lidar.load(tablename:str):void ", "LIDARloadTable;", "Load a LIDAR table from an attached file" ] +[ "logging", "compinfo", "pattern logging.compinfo() (id:bat[:int], component:bat[:str], log_level:bat[:str]) ", "TRACERcomp_info;", "Returns in the form of a SQL result-set all the components along with their ID\nand the their current logging level being set" ] [ "logging", "flush", "command logging.flush():void ", "TRACERflush_buffer;", "Flush the buffer" ] [ "logging", "resetadapter", "command logging.resetadapter():void ", "TRACERreset_adapter;", "Resets the adapter back to the default" ] [ "logging", "resetcomplevel", "command logging.resetcomplevel(comp:int):void ", "TRACERreset_component_level;", "Resets the log level for a specific component back to the default" ] @@ -10924,7 +10925,6 @@ stdout of test 'MAL-signatures` in direc [ "logging", "setcomplevel", "command logging.setcomplevel(comp:int, lvl:int):void ", "TRACERset_component_level;", "Sets the log level for a specific component" ] [ "logging", "setflushlevel", "command logging.setflushlevel(lvl:int):void ", "TRACERset_flush_level;", "Sets the flush level" ] [ "logging", "setlayerlevel", "command logging.setlayerlevel(layer:int, lvl:int):void ", "TRACERset_layer_level;", "Sets the log level for a specific layer" ] -[ "logging", "showinfo", "command logging.showinfo():void ", "TRACERshow_info;", "Dumps to the console all the available logging levels, layers and the components\nalong with their current logging level being set" ] [ "mal", "manifold", "pattern mal.manifold(mod:str, fcn:str, a:any...):bat[:any] ", "MANIFOLDevaluate;", "" ] [ "mal", "multiplex", "pattern mal.multiplex(mod:str, fcn:str, a:any...):any... ", "MANIFOLDremapMultiplex;", "" ] [ "manual", "functions", "pattern manual.functions() (mod:bat[:str], fcn:bat[:str], sig:bat[:str], adr:bat[:str], com:bat[:str]) ", "MANUALcreateOverview;", "Produces a table with all MAL functions known" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -15335,6 +15335,7 @@ stdout of test 'MAL-signatures` in direc [ "lidar", "attach", "pattern lidar.attach(fname:str):void ", "LIDARattach;", "Open a LIDAR file and return catalog of the table HDUs" ] [ "lidar", "export", "pattern lidar.export(tablename:str, fname:str, type:str):void ", "LIDARexportTable;", "Exporta LIDAR table to a LAS/LAZ file" ] [ "lidar", "load", "pattern lidar.load(tablename:str):void ", "LIDARloadTable;", "Load a LIDAR table from an attached file" ] +[ "logging", "compinfo", "pattern logging.compinfo() (id:bat[:int], component:bat[:str], log_level:bat[:str]) ", "TRACERcomp_info;", "Returns in the form of a SQL result-set all the components along with their ID\nand the their current logging level being set" ] [ "logging", "flush", "command logging.flush():void ", "TRACERflush_buffer;", "Flush the buffer" ] [ "logging", "resetadapter", "command logging.resetadapter():void ", "TRACERreset_adapter;", "Resets the adapter back to the default" ] [ "logging", "resetcomplevel", "command logging.resetcomplevel(comp:int):void ", "TRACERreset_component_level;", "Resets the log level for a specific component back to the default" ] @@ -15344,7 +15345,6 @@ stdout of test 'MAL-signatures` in direc [ "logging", "setcomplevel", "command logging.setcomplevel(comp:int, lvl:int):void ", "TRACERset_component_level;", "Sets the log level for a specific component" ] [ "logging", "setflushlevel", "command logging.setflushlevel(lvl:int):void ", "TRACERset_flush_level;", "Sets the flush level" ] [ "logging", "setlayerlevel", "command logging.setlayerlevel(layer:int, lvl:int):void ", "TRACERset_layer_level;", "Sets the log level for a specific layer" ] -[ "logging", "showinfo", "command logging.showinfo():void ", "TRACERshow_info;", "Dumps to the console all the available logging levels, layers and the components\nalong with their current logging level being set" ] [ "mal", "manifold", "pattern mal.manifold(mod:str, fcn:str, a:any...):bat[:any] ", "MANIFOLDevaluate;", "" ] [ "mal", "multiplex", "pattern mal.multiplex(mod:str, fcn:str, a:any...):any... ", "MANIFOLDremapMultiplex;", "" ] [ "manual", "functions", "pattern manual.functions() (mod:bat[:str], fcn:bat[:str], sig:bat[:str], adr:bat[:str], com:bat[:str]) ", "MANUALcreateOverview;", "Produces a table with all MAL functions known" ] 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 @@ -300,8 +300,9 @@ ssize_t GDKstrFromStr(unsigned char *res str GDKstrdup(const char *s) __attribute__((__warn_unused_result__)); str GDKstrndup(const char *s, size_t n) __attribute__((__warn_unused_result__)); void GDKsyserror(_In_z_ _Printf_format_string_ const char *format, ...) __attribute__((__format__(__printf__, 1, 2))); +gdk_return GDKtracer_fill_comp_info(BAT *id, BAT *component, BAT *log_Level); gdk_return GDKtracer_flush_buffer(void); -char *GDKtracer_get_timestamp(const char *fmt); +char *GDKtracer_get_timestamp(const char *fmt, char *buf, size_t sz); gdk_return GDKtracer_log(LOG_LEVEL level, const char *fmt, ...) __attribute__((format(printf, 2, 3))); gdk_return GDKtracer_reset_adapter(void); gdk_return GDKtracer_reset_component_level(int comp); @@ -311,7 +312,6 @@ gdk_return GDKtracer_set_adapter(int ada gdk_return GDKtracer_set_component_level(int comp, int lvl); gdk_return GDKtracer_set_flush_level(int lvl); gdk_return GDKtracer_set_layer_level(int layer, int lvl); -gdk_return GDKtracer_show_info(void); gdk_return GDKtracer_stop(void); size_t GDKuniqueid(size_t offset); gdk_return GDKupgradevarheap(BAT *b, var_t v, bool copyall, bool mayshare) __attribute__((__warn_unused_result__)); @@ -1915,6 +1915,7 @@ str TKNZRgetLevel(bat *r, int *level); str TKNZRlocate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str TKNZRopen(void *r, str *name); str TKNZRtakeOid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str TRACERcomp_info(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str TRACERflush_buffer(void *ret); str TRACERreset_adapter(void *ret); str TRACERreset_component_level(void *ret, int *comp_id); @@ -1924,7 +1925,6 @@ str TRACERset_adapter(void *ret, int *ad str TRACERset_component_level(void *ret, int *comp_id, int *lvl_id); str TRACERset_flush_level(void *ret, int *lvl_id); str TRACERset_layer_level(void *ret, int *layer_id, int *lvl_id); -str TRACERshow_info(void *ret); int TRACEtable(Client cntxt, BAT **r); str TRNglobal_abort(bit *ret); str TRNglobal_commit(bit *ret); diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c --- a/clients/mapiclient/mclient.c +++ b/clients/mapiclient/mclient.c @@ -2890,7 +2890,7 @@ doFile(Mapi mid, stream *fp, bool useins if (mapi_get_querytype(hdl) == Q_PREPARE) { prepno = mapi_get_tableid(hdl); - assert(prepno < 100); + assert(mode != SQL || formatter != TESTformatter || prepno < 100); /* prepno is used only at the TestWeb */ } rc = format_result(mid, hdl, interactive || echoquery); diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c --- a/common/utils/msabaoth.c +++ b/common/utils/msabaoth.c @@ -640,7 +640,7 @@ msab_getSingleStatus(const char *pathbuf } (void)fclose(f); } - } else if ((snprintf(buf, sizeof(buf), "%s/%s/%s", pathbuf, dbname, ".gdk_lock") > 0) & /* no typo */ + } else if (snprintf(buf, sizeof(buf), "%s/%s/%s", pathbuf, dbname, ".gdk_lock"), ((fd = MT_lockf(buf, F_TEST)) == -2)) { /* Locking failed; this can be because the lockfile couldn't * be created. Probably there is no Mserver running for diff --git a/common/utils/mstring.h b/common/utils/mstring.h --- a/common/utils/mstring.h +++ b/common/utils/mstring.h @@ -23,7 +23,6 @@ strcpy_len(char *restrict dst, const cha return i; } dst[n - 1] = 0; - return n-1; } return strlen(src); } diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -1147,7 +1147,7 @@ AS_VAR_IF([have_bz2], [no], [], [ [AC_SUBST([PKG_BZIP2], [bzip2])]) AS_VAR_IF([have_bz2], [yes], [AC_DEFINE([HAVE_LIBBZ2], 1, [Define if you have the bz2 library])])]) -AM_CONDITIONAL([HAVE_LIBBZ2], [test x"$have_libbz2" != xno]) +AM_CONDITIONAL([HAVE_LIBBZ2], [test x"$have_bz2" != xno]) @@ -1556,12 +1556,12 @@ AC_ARG_WITH([lzma], [include lzma support (default=yes)])], [have_lzma=$withval]) AS_VAR_IF([have_lzma], [no], [], [ - PKG_CHECK_MODULES([liblzma], [liblzma], [have_liblzma=yes], [have_liblzma=no; why_not_liblzma="(liblzma not found, install xz-libs and xz-devel)"]) - AS_VAR_IF([have_liblzma], [yes], [ + PKG_CHECK_MODULES([liblzma], [liblzma], [have_lzma=yes], [have_lzma=no; why_not_liblzma="(liblzma not found, install xz-libs and xz-devel)"]) + AS_VAR_IF([have_lzma], [yes], [ AC_SUBST([PKG_LIBLZMA], [liblzma])]) - AS_VAR_IF([have_liblzma], [yes], [ + AS_VAR_IF([have_lzma], [yes], [ AC_DEFINE([HAVE_LIBLZMA], 1, [Define if you have the lzma library])])]) -AM_CONDITIONAL([HAVE_LIBLZMA], [test x"$have_liblzma" != xno]) +AM_CONDITIONAL([HAVE_LIBLZMA], [test x"$have_lzma" != xno]) org_have_valgrind=no have_valgrind=$org_have_valgrind @@ -2148,22 +2148,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_DEFINE([HAVE_STDATOMIC_H], 1, [Define to 1 if you have the <stdatomic.h> header file.])], [AC_MSG_RESULT([no])]) -AC_MSG_CHECKING([if your compiler understands `__hidden']) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - @%:@include <stdlib.h> - - __hidden void foo (const char *a, ...); - - void foo (const char *a, ...) - { (void)a; } - ]], - [[ foo ("%s", ""); ]] - )], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - AC_DEFINE([__hidden], [/* empty */], - [Does your compiler support the `__hidden' specifier?])]) - AC_MSG_CHECKING([if your compiler understands `_Noreturn']) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @%:@include <stdlib.h> diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +monetdb (11.35.13) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Wed, 12 Feb 2020 11:03:15 +0100 + +monetdb (11.35.11) unstable; urgency=low + + * Rebuilt. + * BZ#6805: Using the cascade operator in a drop table statement ends in + an exit from the Monetdb shell. + * BZ#6807: Median_avg and quantile_avg ignore NULL values + * BZ#6815: query with ifthenelse() crashes mserver5 + * BZ#6816: Monetdb Crashes on INSERT statement after ALTER statement in + another connection + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 11 Feb 2020 14:07:49 +0100 + monetdb (11.35.9) unstable; urgency=low * Rebuilt. diff --git a/gdk/ChangeLog b/gdk/ChangeLog --- a/gdk/ChangeLog +++ b/gdk/ChangeLog @@ -1,4 +1,4 @@ -# ChangeLog file for MonetDB +# ChangeLog file for GDK # This file is updated with Maddlog * Tue Dec 3 2019 Sjoerd Mullender <sjo...@acm.org> diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -1534,10 +1534,14 @@ typedef struct { BAT *cache; /* if loaded: BAT* handle */ char *logical; /* logical name (may point at bak) */ char bak[16]; /* logical name backup (tmp_%o) */ + BAT *desc; /* the BAT descriptor */ + char *options; /* A string list of options */ +#if SIZEOF_VOID_P == 4 + char physical[20]; /* dir + basename for storage */ +#else + char physical[24]; /* dir + basename for storage */ +#endif bat next; /* next BBP slot in linked list */ - BAT *desc; /* the BAT descriptor */ - char physical[20]; /* dir + basename for storage */ - str options; /* A string list of options */ int refs; /* in-memory references on which the loaded status of a BAT relies */ int lrefs; /* logical references on which the existence of a BAT relies */ volatile unsigned status; /* status mask used for spin locking */ @@ -1545,19 +1549,20 @@ typedef struct { } BBPrec; gdk_export bat BBPlimit; +#if SIZEOF_VOID_P == 4 #define N_BBPINIT 1000 -#if SIZEOF_VOID_P == 4 #define BBPINITLOG 11 #else +#define N_BBPINIT 10000 #define BBPINITLOG 14 #endif #define BBPINIT (1 << BBPINITLOG) /* absolute maximum number of BATs is N_BBPINIT * BBPINIT * this also gives the longest possible "physical" name and "bak" name - * of a BAT: the "bak" name is "tmp_%o", so at most 12 + \0 bytes on + * of a BAT: the "bak" name is "tmp_%o", so at most 14 + \0 bytes on * 64 bit architecture and 11 + \0 on 32 bit architecture; the * physical name is a bit more complicated, but the longest possible - * name is 17 + \0 bytes (16 + \0 on 32 bits) */ + * name is 22 + \0 bytes (16 + \0 on 32 bits) */ gdk_export BBPrec *BBP[N_BBPINIT]; /* fast defines without checks; internal use only */ diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c --- a/gdk/gdk_bbp.c _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
