MonetDB: mosaic - Merge with default.
Changeset: fa7e04346640 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa7e04346640 Added Files: ChangeLog.Jun2020 buildtools/ChangeLog.Jun2020 clients/ChangeLog.Jun2020 clients/mapilib/ChangeLog.Jun2020 common/stream/ChangeLog.Jun2020 documentation/source/json.rst gdk/ChangeLog.Jun2020 gdk/gdk_geomlogger.h gdk/gdk_logger_internals.h gdk/gdk_time.c gdk/gdk_time.h geom/ChangeLog.Jun2020 monetdb5/ChangeLog.Jun2020 sql/ChangeLog.Jun2020 sql/ChangeLog.linear-hashing sql/test/BugTracker-2015/Tests/trigger-old-row.Bug-3741.sql sql/test/BugTracker-2015/Tests/trigger-old-row.Bug-3741.stable.err sql/test/BugTracker-2015/Tests/trigger-old-row.Bug-3741.stable.out sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.single sql/test/BugTracker-2017/Tests/date-arithmetic.Bug-6415.sql sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.py sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.stable.err sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.stable.out sql/test/Tests/mediumint.sql sql/test/Tests/mediumint.stable.err sql/test/Tests/mediumint.stable.out sql/test/Tests/sysqueue.sql sql/test/Tests/sysqueue.stable.err sql/test/Tests/sysqueue.stable.out sql/test/merge-partitions/Tests/mergepart30.sql sql/test/merge-partitions/Tests/mergepart30.stable.err sql/test/merge-partitions/Tests/mergepart30.stable.out sql/test/miscellaneous/Tests/create_func_temp.sql sql/test/miscellaneous/Tests/create_func_temp.stable.err sql/test/miscellaneous/Tests/create_func_temp.stable.out sql/test/miscellaneous/Tests/table_udf_missing_var.py sql/test/miscellaneous/Tests/table_udf_missing_var.stable.err sql/test/miscellaneous/Tests/table_udf_missing_var.stable.out sql/test/subquery/Tests/subquery5.sql sql/test/subquery/Tests/subquery5.stable.err sql/test/subquery/Tests/subquery5.stable.out sql/test/sys-schema/Tests/utilities.sql sql/test/sys-schema/Tests/utilities.stable.err sql/test/sys-schema/Tests/utilities.stable.out testing/ChangeLog.Jun2020 tools/merovingian/ChangeLog.Jun2020 tools/merovingian/daemon/snapshot.c tools/merovingian/daemon/snapshot.h Removed Files: debian/fix-deb.sh monetdb5/modules/kernel/batmmath.h sql/test/rdf/Tests/q8_v_small.reqtests sql/test/rdf/Tests/q8_v_small.sql sql/test/rdf/Tests/q8_v_small.stable.err sql/test/rdf/Tests/q8_v_small.stable.out Modified Files: .hgtags ChangeLog MonetDB.spec NT/Makefile NT/makelibdef.py NT/mkodbcwxs.py NT/mksqlwxs.py NT/monetdb_config.h.in NT/rules.msc NT/winconfig.py buildtools/autogen/autogen.py buildtools/autogen/autogen/am.py buildtools/autogen/autogen/codegen.py buildtools/autogen/autogen/msc.py buildtools/conf/fixlicense.py clients/ChangeLog clients/R/Tests/dbi.R clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SingleServer clients/Tests/exports.stable.out clients/examples/C/smack00.c clients/examples/C/smack01.c clients/examples/perl/sqlsample.pl clients/examples/python/basics.py clients/examples/python/sqlsample.py clients/mapiclient/dotfile.py clients/mapiclient/dotmonetdb.c clients/mapiclient/dump.c clients/mapiclient/mclient.1 clients/mapiclient/mclient.c clients/mapiclient/stethoscope.c clients/mapilib/mapi.c clients/mapilib/mapi.rc clients/mapilib/monetdb-mapi.pc.in clients/odbc/driver/ODBCConvert.c clients/odbc/driver/ODBCDbc.h clients/odbc/driver/ODBCStmt.h clients/odbc/driver/ODBCUtil.c clients/odbc/driver/SQLBindParameter.c clients/odbc/driver/SQLBrowseConnect.c clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driver/SQLConnect.c clients/odbc/driver/SQLDriverConnect.c clients/odbc/driver/SQLExecDirect.c clients/odbc/driver/SQLExecute.c clients/odbc/driver/SQLForeignKeys.c clients/odbc/driver/SQLGetTypeInfo.c clients/odbc/driver/SQLNativeSql.c clients/odbc/driver/SQLPrepare.c clients/odbc/driver/SQLPrimaryKeys.c clients/odbc/driver/SQLProcedureColumns.c clients/odbc/driver/SQLProcedures.c clients/odbc/driver/SQLSetCursorName.c clients/odbc/driver/SQLSpecialColumns.c clients/odbc/driver/SQLStatist
MonetDB: mosaic - Merge with Default
Changeset: 037ca6b1f211 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=037ca6b1f211 Added Files: sql/backends/monet5/Tests/SingleServer sql/benchmarks/arno_flt/Tests/SingleServer sql/benchmarks/nobench/Tests/SingleServer sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.stable.err sql/test/Users/Tests/metadataConsistency.sql sql/test/Users/Tests/metadataConsistency.stable.err sql/test/Users/Tests/metadataConsistency.stable.out sql/test/VOC/VOCcreate_user.sql sql/test/VOC/VOCdrop.sql sql/test/VOC/VOCdrop_user.sql sql/test/VOC/VOCinsert.sql sql/test/VOC/VOCmanual_examples.sql sql/test/VOC/VOCquery.sql sql/test/merge-statements/Tests/mergestmt04.sql sql/test/merge-statements/Tests/mergestmt04.stable.err sql/test/merge-statements/Tests/mergestmt04.stable.out sql/test/miscellaneous/Tests/groupings.sql sql/test/miscellaneous/Tests/groupings.stable.err sql/test/miscellaneous/Tests/groupings.stable.out tools/merovingian/client/Tests/monetdb_status.stable.err tools/merovingian/client/Tests/monetdb_status.stable.out Removed Files: sql/backends/monet5/UDF/pyapi/Tests/SingleServer sql/backends/monet5/vaults/bam/Tests/SingleServer sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.timeout sql/test/Tests/testlz4.lz4 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/odbc/driver/ODBCEnv.c documentation/source/manual_pages/mclient.rst documentation/source/manual_pages/monetdb.rst documentation/source/manual_pages/monetdbd.rst.in documentation/source/manual_pages/mserver5.rst.in documentation/source/manual_pages/msqldump.rst gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc_compare.h gdk/gdk_cand.c gdk/gdk_delta.c gdk/gdk_delta.h gdk/gdk_group.c gdk/gdk_hash.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_mosaic.c gdk/gdk_orderidx.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_sample.c gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_string.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_tm.c gdk/gdk_tracer.c gdk/gdk_tracer.h gdk/gdk_unique.c gdk/gdk_utils.c gdk/gdk_utils.h geom/monetdb5/geom.c monetdb5/extras/rapi/converters.c.h monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_atom.c monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_exception.c monetdb5/mal/mal_import.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_linker.c monetdb5/mal/mal_namespace.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_private.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resolve.c monetdb5/modules/atoms/identifier.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/str.c monetdb5/modules/atoms/url.c monetdb5/modules/atoms/uuid.c monetdb5/modules/kernel/batstr.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/oltp.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/projectionpath.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tracer.c monetdb5/modules/mal/tracer.h monetdb5/modules/mal/tracer.mal monetdb5/modules/mosaic/mosaic.c monetdb5/modules/mosaic/mosaic.h monetdb5/modules/mosaic/mosaic_join.h monetdb5/modules/mosaic/mosaic_template.h monetdb5/optimizer/opt_json.c monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_pushselect.c sql/backends/monet5/UDF/capi/capi.c sql/backends/monet5/UDF/pyapi3/connection3.c sql/backends/monet5/UDF/pyapi3/conversion3.c sql/backends/monet5/UDF/udf/udf.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_execute.c
MonetDB: mosaic - Merge with default.
Changeset: dc20acc4a865 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc20acc4a865 Added Files: clients/R/Tests/SingleServer clients/Tests/SingleServer clients/mapiclient/Tests/SingleServer geom/BugTracker/Tests/SingleServer geom/sql/conformance/Tests/SingleServer geom/sql/functions/Tests/SingleServer geom/sql/pg_regression/Tests/SingleServer monetdb5/extras/mal_optimizer_template/Tests/SingleServer monetdb5/extras/rapi/Tests/SingleServer monetdb5/mal/Tests/SingleServer monetdb5/modules/atoms/Tests/SingleServer monetdb5/modules/kernel/Tests/SingleServer monetdb5/modules/mal/Tests/SingleServer monetdb5/optimizer/Tests/SingleServer monetdb5/scheduler/Tests/SingleServer sql/backends/monet5/UDF/capi/Tests/SingleServer sql/backends/monet5/UDF/pyapi/Tests/SingleServer sql/backends/monet5/UDF/pyapi3/Tests/SingleServer sql/backends/monet5/UDF/udf/Tests/SingleServer sql/backends/monet5/generator/Tests/SingleServer sql/backends/monet5/vaults/bam/Tests/SingleServer sql/benchmarks/ATIS/Tests/SingleServer sql/benchmarks/arno/Tests/SingleServer sql/benchmarks/blob/Tests/SingleServer sql/benchmarks/moa/Tests/SingleServer sql/benchmarks/ssbm/Tests/SingleServer sql/benchmarks/tpcds/Tests/SingleServer sql/benchmarks/tpch/LOCKED/Tests/SingleServer sql/benchmarks/tpch/Tests/SingleServer sql/benchmarks/viam/Tests/SingleServer sql/jdbc/tests/Tests/SingleServer sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.bat sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.sh sql/jdbc/tests/Tests/bogus-auto-generated-keys.sql sql/jdbc/tests/Tests/bogus-auto-generated-keys.stable.err sql/jdbc/tests/Tests/bogus-auto-generated-keys.stable.out sql/odbc/samples/Tests/SingleServer sql/server/rel_rewriter.c sql/server/rel_rewriter.h sql/test/ADT2006/Tests/SingleServer sql/test/BugConstraints/Tests/SingleServer sql/test/BugDay_2005-10-06_2.8/Tests/SingleServer sql/test/BugDay_2005-10-06_2.9.3/Tests/SingleServer sql/test/BugDay_2005-11-09_2.8/Tests/SingleServer sql/test/BugDay_2005-11-09_2.9.3/Tests/SingleServer sql/test/BugDay_2005-12-19_2.9.3/Tests/SingleServer sql/test/BugTracker-2008/Tests/SingleServer sql/test/BugTracker-2009/Tests/SingleServer sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.SQL.py sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.SQL.py sql/test/BugTracker-2010/Tests/SingleServer sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.SQL.py sql/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/SingleServer sql/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/SingleServer sql/test/BugTracker-2011/Tests/SingleServer sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py sql/test/BugTracker-2012/Tests/SingleServer sql/test/BugTracker-2013/Tests/SingleServer sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py sql/test/BugTracker-2014/Tests/SingleServer sql/test/BugTracker-2015/Tests/SingleServer sql/test/BugTracker-2016/Tests/SingleServer sql/test/BugTracker-2017/Tests/SingleServer sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py sql/test/BugTracker-2018/Tests/SingleServer sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.SQL.py sql/test/BugTracker-2019/Tests/SingleServer sql/test/BugTracker-2020/Tests/SingleServer sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.sql sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.stable.err sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.stable.out sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.stable.err sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.stable.out sql/test/BugTracker-2020/Tests/ntile-wrong-results.Bug-6829.sql sql/test/BugTracker-2020/Tests/ntile-wrong-results.Bug-6829.stable.err sql/test/BugTracker-2020/Tests/ntile-wrong-results.Bug-6829.stable.out sql/test/BugTracker-2020/Tests/window-order-by-extract.Bug-6828.sql sql/test/BugTracker-2020/Tests/window-order-by-extract.Bug-6828.stable.err sql/test/BugTracker-2020/Tests/window-order-by-extract.Bug-6828.stable.out sql/test/BugTracker/Tests/SingleServer sql/test/BugTracker/Tests/connect_crash.SF-1436626.SQL.py sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py sql/tes
MonetDB: mosaic - Merge with default.
Changeset: aabd011085e4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aabd011085e4 Added Files: clients/mapilib/mapi_prompt.h clients/mapilib/mapi_querytype.h sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_00.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_01.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_02.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_03.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_04.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_05.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_07.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_09.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_10.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_11.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_12.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_13.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_16.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_17.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_19.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_20.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_21.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_24.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_25.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_26.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_27.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_28.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_29.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_30.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_32.sql sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.sql sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_02.sql sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_05.sql sql/test/BugTracker-2020/Tests/ifthenelse-crash.Bug-6815.sql sql/test/BugTracker-2020/Tests/ifthenelse-crash.Bug-6815.stable.err sql/test/BugTracker-2020/Tests/ifthenelse-crash.Bug-6815.stable.out Removed Files: clients/mapiclient/Tests/tachograph--help clients/mapiclient/Tests/tachograph--help.bat clients/mapiclient/Tests/tachograph--help.stable.err clients/mapiclient/Tests/tachograph--help.stable.out clients/mapiclient/Tests/tomograph--help clients/mapiclient/Tests/tomograph--help.bat clients/mapiclient/Tests/tomograph--help.stable.err clients/mapiclient/Tests/tomograph--help.stable.out clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c debian/monetdb-client-tools.docs debian/monetdb-client-tools.install sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_00.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_01.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_02.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_03.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_04.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_05.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_07.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_09.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_10.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_11.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_12.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_13.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_15.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_16.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_17.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_19.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_20.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_21.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_24.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_25.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_26.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_27.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_28.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_29.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_30.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_31.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_31.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_31.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_32.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.sql.src sql/backends/mone
MonetDB: mosaic - Merge with default.
Changeset: 4070ca6c31f0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4070ca6c31f0 Added Files: sql/backends/monet5/UDF/pyapi3/connection.h sql/backends/monet5/UDF/pyapi3/conversion.h sql/backends/monet5/UDF/pyapi3/convert_loops.h sql/backends/monet5/UDF/pyapi3/emit.h sql/backends/monet5/UDF/pyapi3/formatinput.h sql/backends/monet5/UDF/pyapi3/pyapi.h sql/backends/monet5/UDF/pyapi3/pyheader.h sql/backends/monet5/UDF/pyapi3/pytypes.h sql/backends/monet5/UDF/pyapi3/type_conversion.h sql/backends/monet5/UDF/pyapi3/undef.h sql/backends/monet5/UDF/pyapi3/unicode.h sql/test/analytics/Tests/analytics14.sql sql/test/analytics/Tests/analytics14.stable.err sql/test/analytics/Tests/analytics14.stable.out sql/test/analytics/Tests/analytics15.sql sql/test/analytics/Tests/analytics15.stable.err sql/test/analytics/Tests/analytics15.stable.out sql/test/analytics/Tests/analytics16.sql sql/test/analytics/Tests/analytics16.stable.err sql/test/analytics/Tests/analytics16.stable.out sql/test/analytics/Tests/analytics17.sql sql/test/analytics/Tests/analytics17.stable.err sql/test/analytics/Tests/analytics17.stable.out Removed Files: clients/examples/python/mclient-python2.py debian/libmonetdb5-server-bam.install debian/monetdb-python2.install sql/backends/monet5/Tests/createorreplace.sql sql/backends/monet5/Tests/createorreplace.stable.err sql/backends/monet5/Tests/createorreplace.stable.out sql/backends/monet5/Tests/pyapi00.sql sql/backends/monet5/Tests/pyapi00.stable.err sql/backends/monet5/Tests/pyapi00.stable.out sql/backends/monet5/Tests/pyapi01.sql sql/backends/monet5/Tests/pyapi01.stable.err sql/backends/monet5/Tests/pyapi01.stable.out sql/backends/monet5/Tests/pyapi02.sql sql/backends/monet5/Tests/pyapi02.stable.err sql/backends/monet5/Tests/pyapi02.stable.out sql/backends/monet5/Tests/pyapi03.sql sql/backends/monet5/Tests/pyapi03.stable.err sql/backends/monet5/Tests/pyapi03.stable.out sql/backends/monet5/Tests/pyapi04.sql sql/backends/monet5/Tests/pyapi04.stable.err sql/backends/monet5/Tests/pyapi04.stable.out sql/backends/monet5/Tests/pyapi05.sql sql/backends/monet5/Tests/pyapi05.stable.err sql/backends/monet5/Tests/pyapi05.stable.out sql/backends/monet5/Tests/pyapi06.sql sql/backends/monet5/Tests/pyapi06.stable.err sql/backends/monet5/Tests/pyapi06.stable.out sql/backends/monet5/Tests/pyapi07.sql sql/backends/monet5/Tests/pyapi07.stable.err sql/backends/monet5/Tests/pyapi07.stable.out sql/backends/monet5/Tests/pyapi08.sql sql/backends/monet5/Tests/pyapi08.stable.err sql/backends/monet5/Tests/pyapi08.stable.out sql/backends/monet5/Tests/pyapi09.sql sql/backends/monet5/Tests/pyapi09.stable.err sql/backends/monet5/Tests/pyapi09.stable.out sql/backends/monet5/Tests/pyapi10.sql sql/backends/monet5/Tests/pyapi10.stable.err sql/backends/monet5/Tests/pyapi10.stable.err.Windows sql/backends/monet5/Tests/pyapi10.stable.out sql/backends/monet5/Tests/pyapi11.sql sql/backends/monet5/Tests/pyapi11.stable.err sql/backends/monet5/Tests/pyapi11.stable.out sql/backends/monet5/Tests/pyapi12.sql sql/backends/monet5/Tests/pyapi12.stable.err sql/backends/monet5/Tests/pyapi12.stable.out sql/backends/monet5/Tests/pyapi13.sql sql/backends/monet5/Tests/pyapi13.stable.err sql/backends/monet5/Tests/pyapi13.stable.out sql/backends/monet5/Tests/pyapi14.sql sql/backends/monet5/Tests/pyapi14.stable.err sql/backends/monet5/Tests/pyapi14.stable.out sql/backends/monet5/Tests/pyapi15.sql sql/backends/monet5/Tests/pyapi16.sql sql/backends/monet5/Tests/pyapi16.stable.err sql/backends/monet5/Tests/pyapi16.stable.out sql/backends/monet5/Tests/pyapi17.sql sql/backends/monet5/Tests/pyapi17.stable.err sql/backends/monet5/Tests/pyapi17.stable.out sql/backends/monet5/Tests/pyapi18.sql sql/backends/monet5/Tests/pyapi18.stable.err sql/backends/monet5/Tests/pyapi18.stable.out sql/backends/monet5/Tests/pyapi19.sql sql/backends/monet5/Tests/pyapi19.stable.err sql/backends/monet5/Tests/pyapi19.stable.out sql/backends/monet5/Tests/pyapi20.sql sql/backends/monet5/Tests/pyapi20.stable.err sql/backends/monet5/Tests/pyapi20.stable.out sql/backends/monet5/Tests/pyapi21.sql sql/backends/monet5/Tests/pyapi21.stable.err sql/backends/monet5/Tests/pyapi21.stable.out sql/backends/monet5/Tests/pyapi23.sql
MonetDB: mosaic - Merge with default.
Changeset: 0757d72aac7f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0757d72aac7f Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 geom/lib/libgeom.c geom/lib/libgeom.h geom/monetdb5/geom.c monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/mal/Tests/tst002.stable.err monetdb5/mal/Tests/tst054.stable.err monetdb5/mal/Tests/tst058.stable.err monetdb5/mal/mal_parser.c monetdb5/optimizer/opt_postfix.c sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/common/sql_types.c sql/server/rel_updates.c sql/server/sql_privileges.c sql/server/sql_privileges.h sql/storage/sql_storage.h sql/storage/store.c sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out 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/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 Branch: mosaic Log Message: Merge with default. diffs (truncated from 2117 to 300 lines): 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 @@ -11746,7 +11746,7 @@ stdout of test 'MAL-signatures` in direc [ "sql", "bind_idxbat", "pattern sql.bind_idxbat(mvc:int, schema:str, table:str, index:str, access:int, part_nr:int, nr_parts:int):bat[:any_1] ", "mvc_bind_idxbat_wrap;","Bind the 'schema.table.index' BAT with access kind:\n\t0 - base table\n\t1 - inserts\n\t2 - updates" ] [ "sql", "clear_table", "unsafe pattern sql.clear_table(sname:str, tname:str):lng ","mvc_clear_table_wrap;","Clear the table sname.tname." ] [ "sql", "commit", "pattern sql.commit():void ", "SQLcommit;", "Trigger the commit operation for a MAL block" ] -[ "sql", "copy_from","unsafe pattern sql.copy_from(sname:str, tname:str, sep:str, rsep:str, ssep:str, ns:str, fname:str, nr:lng, offset:lng, locked:int, best:int, fwf:str, onclient:int):bat[:any]... ", "mvc_import_table_wrap;", "Import a table from bstream s with the \n\tgiven tuple and seperators (sep/rsep)" ] +[ "sql", "copy_from","unsafe pattern sql.copy_from(t:ptr, sep:str, rsep:str, ssep:str, ns:str, fname:str, nr:lng, offset:lng, locked:int, best:int, fwf:str, onclient:int):bat[:any]... ", "mvc_import_table_wrap;", "Import a table from bstream s with the \n\tgiven tuple and seperators (sep/rsep)" ] [ "sql", "copy_rejects", "pattern sql.copy_rejects() (rowid:bat[:lng], fldid:bat[:int], msg:bat[:str], inp:bat[:str]) ", "COPYrejects;", "" ] [ "sql", "copy_rejects_clear", "pattern sql.copy_rejects_clear():void ", "COPYrejects_clear;", "" ] [ "sql", "count","pattern sql.count(b:any_1, ignils:bit, s:lng, e:lng):lng ","SQLcount;","return count of groups"] 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 @@ -16151,7 +16151,7 @@ stdout of test 'MAL-signatures` in direc [ "sql", "bind_idxbat", "pattern sql.bind_idxbat(mvc:int, schema:str, table:str, index:str, access:int, part_nr:int, nr_parts:int):bat[:any_1] ", "mvc_bind_idxbat_wrap;","Bind the 'schema.table.index' BAT with access kind:\n\t0 - base table\n\t1 - inserts\n\t2 - updates" ] [ "sql", "clear_table", "unsafe pattern sql.clear_table(sname:str, tname:str):lng ","mvc_clear_table_wrap;","Clear the table sname.tname." ] [ "sql", "commit", "pattern sql.commit():void ", "SQLcommit;", "Trigger the commit operation for a MAL block"
MonetDB: mosaic - Merge with default.
Changeset: c30804d857bd for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c30804d857bd Added Files: documentation/Makefile documentation/make.bat documentation/source/conf.py documentation/source/index.rst documentation/source/input.rst gdk/gdk_tracer.c gdk/gdk_tracer.h monetdb5/mal/Tests/tracer00.malC monetdb5/mal/Tests/tracer00.stable.err monetdb5/mal/Tests/tracer00.stable.out monetdb5/mal/Tests/tst111.malC monetdb5/mal/Tests/tst111.stable.err monetdb5/mal/Tests/tst111.stable.out monetdb5/mal/Tests/tst112.malC monetdb5/mal/Tests/tst112.stable.err monetdb5/mal/Tests/tst112.stable.out monetdb5/mal/Tests/tst113.malC monetdb5/mal/Tests/tst113.stable.err monetdb5/mal/Tests/tst113.stable.out monetdb5/mal/Tests/tst114.malC monetdb5/mal/Tests/tst114.stable.err monetdb5/mal/Tests/tst114.stable.out monetdb5/mal/Tests/tst117.malC monetdb5/mal/Tests/tst117.stable.err monetdb5/mal/Tests/tst117.stable.out monetdb5/mal/Tests/tst180.malC monetdb5/mal/Tests/tst180.stable.err monetdb5/mal/Tests/tst180.stable.out monetdb5/mal/Tests/tst190.malC monetdb5/mal/Tests/tst190.stable.err monetdb5/mal/Tests/tst190.stable.out monetdb5/mal/Tests/tst191.malC monetdb5/mal/Tests/tst191.stable.err monetdb5/mal/Tests/tst191.stable.out monetdb5/mal/Tests/tst192.malC monetdb5/mal/Tests/tst192.stable.err monetdb5/mal/Tests/tst192.stable.out monetdb5/mal/Tests/tst193.malC monetdb5/mal/Tests/tst193.stable.err monetdb5/mal/Tests/tst193.stable.out monetdb5/mal/Tests/tst194.malC monetdb5/mal/Tests/tst194.stable.err monetdb5/mal/Tests/tst194.stable.out monetdb5/mal/Tests/tst195.malC monetdb5/mal/Tests/tst195.stable.err monetdb5/mal/Tests/tst195.stable.out monetdb5/mal/Tests/tst196.malC monetdb5/mal/Tests/tst196.stable.err monetdb5/mal/Tests/tst196.stable.out monetdb5/mal/Tests/tst914.malC monetdb5/mal/Tests/tst914.stable.err monetdb5/mal/Tests/tst914.stable.out monetdb5/modules/mal/tracer.c monetdb5/modules/mal/tracer.h monetdb5/modules/mal/tracer.mal sql/scripts/81_tracer.sql sql/test/BugTracker-2019/Tests/set-schema-mclient-msg.Bug-6754.sql sql/test/BugTracker-2019/Tests/set-schema-mclient-msg.Bug-6754.stable.err sql/test/BugTracker-2019/Tests/set-schema-mclient-msg.Bug-6754.stable.out sql/test/BugTracker-2020/Tests/All sql/test/BugTracker-2020/Tests/median_avg-nulls.Bug-6807.sql sql/test/BugTracker-2020/Tests/median_avg-nulls.Bug-6807.stable.err sql/test/BugTracker-2020/Tests/median_avg-nulls.Bug-6807.stable.out sql/test/wlcr/Tests/wlr110.py sql/test/wlcr/Tests/wlr110.stable.err sql/test/wlcr/Tests/wlr110.stable.out sql/test/wlcr/Tests/wlr35.py sql/test/wlcr/Tests/wlr35.stable.err sql/test/wlcr/Tests/wlr35.stable.out Removed Files: sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.options5 sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.sql sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.err sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out Modified Files: .hgignore HowToStart.rst Makefile.ag MonetDB.spec NT/Makefile NT/mksqlwxs.py NT/monetdb_config.h.in NT/rules.msc NT/wincompile.py NT/winconfig.py README.rst bootstrap buildtools/Makefile.ag buildtools/autogen/autogen.py buildtools/autogen/autogen/am.py buildtools/autogen/autogen/codegen.py buildtools/autogen/autogen/filesplit.py buildtools/autogen/autogen/msc.py buildtools/autogen/autogen/var.py buildtools/conf/Maddlog buildtools/conf/Makefile.ag buildtools/conf/fixlicense.py buildtools/conf/rules.mk buildtools/conf/website.html buildtools/doc/HowToRelease.rst buildtools/doc/windowsbuild.rst clients/Makefile.ag clients/NT/Makefile.ag clients/NT/mclient.bat clients/NT/msqldump.bat clients/NT/stethoscope.bat clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/examples/C/Makefile.ag clients/examples/C/sample0.c clients/examples/C/sample1.c clients/examples/C/sample4.c clients/examples/C/smack00.c clients/examples/C/smack01.c clients/examples/Makefile.ag clients/examples/perl/Makefile.ag cl
MonetDB: mosaic - Merge with default.
Changeset: 685c08f6c557 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=685c08f6c557 Added Files: sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat.in sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat.in sql/benchmarks/tpcds/Tests/load.timeout sql/test/BugTracker-2017/Tests/error-clean-cache.Bug-6351.sql sql/test/BugTracker-2017/Tests/error-clean-cache.Bug-6351.stable.err sql/test/BugTracker-2017/Tests/error-clean-cache.Bug-6351.stable.out sql/test/BugTracker-2019/Tests/cast-interval.Bug-6793.sql sql/test/BugTracker-2019/Tests/cast-interval.Bug-6793.stable.err sql/test/BugTracker-2019/Tests/cast-interval.Bug-6793.stable.out sql/test/BugTracker-2019/Tests/could-not-allocate-space.Bug-6795.sql sql/test/BugTracker-2019/Tests/could-not-allocate-space.Bug-6795.stable.err sql/test/BugTracker-2019/Tests/could-not-allocate-space.Bug-6795.stable.out sql/test/BugTracker-2019/Tests/drop-table-cascade.Bug-6805.sql sql/test/BugTracker-2019/Tests/drop-table-cascade.Bug-6805.stable.err sql/test/BugTracker-2019/Tests/drop-table-cascade.Bug-6805.stable.out sql/test/BugTracker-2019/Tests/json-text-empty-separator.Bug-6798.sql sql/test/BugTracker-2019/Tests/json-text-empty-separator.Bug-6798.stable.err sql/test/BugTracker-2019/Tests/json-text-empty-separator.Bug-6798.stable.out sql/test/BugTracker-2019/Tests/orderby-alias-expr.Bug-6799.sql sql/test/BugTracker-2019/Tests/orderby-alias-expr.Bug-6799.stable.err sql/test/BugTracker-2019/Tests/orderby-alias-expr.Bug-6799.stable.out sql/test/BugTracker-2019/Tests/prepared-select-with-error-causes-hang.Bug-6761.sql sql/test/BugTracker-2019/Tests/prepared-select-with-error-causes-hang.Bug-6761.stable.err sql/test/BugTracker-2019/Tests/prepared-select-with-error-causes-hang.Bug-6761.stable.out sql/test/BugTracker-2019/Tests/python-aggregate-no-groups.Bug-6726.sql sql/test/BugTracker-2019/Tests/python-aggregate-no-groups.Bug-6726.stable.err sql/test/BugTracker-2019/Tests/python-aggregate-no-groups.Bug-6726.stable.out sql/test/BugTracker-2019/Tests/python3-udf-modules.Bug-6797.sql sql/test/BugTracker-2019/Tests/python3-udf-modules.Bug-6797.stable.err sql/test/BugTracker-2019/Tests/python3-udf-modules.Bug-6797.stable.out sql/test/mergetables/Tests/sqlsmith-exists2.sql sql/test/mergetables/Tests/sqlsmith-exists2.stable.err sql/test/mergetables/Tests/sqlsmith-exists2.stable.out sql/test/mergetables/Tests/sqlsmith.Bug-6480.reqtests sql/test/mergetables/Tests/transaction-conflict.py sql/test/mergetables/Tests/transaction-conflict.stable.err sql/test/mergetables/Tests/transaction-conflict.stable.out sql/test/miscellaneous/Tests/deallocate.sql sql/test/miscellaneous/Tests/deallocate.stable.err sql/test/miscellaneous/Tests/deallocate.stable.out sql/test/scanner/Tests/mserver_with_raw_strings.options5 sql/test/scanner/Tests/mserver_with_raw_strings.sql sql/test/scanner/Tests/mserver_with_raw_strings.stable.err sql/test/scanner/Tests/mserver_with_raw_strings.stable.out sql/test/scanner/Tests/mserver_without_raw_strings.options5 sql/test/scanner/Tests/mserver_without_raw_strings.sql sql/test/scanner/Tests/mserver_without_raw_strings.stable.err sql/test/scanner/Tests/mserver_without_raw_strings.stable.out tools/merovingian/client/Tests/All tools/merovingian/client/Tests/monetdb_status.py Removed Files: sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat sql/test/BugTracker-2019/Tests/prepared-select-with-error-causes-hang.Jira-292.sql sql/test/BugTracker-2019/Tests/prepared-select-with-error-causes-hang.Jira-292.stable.err sql/test/BugTracker-2019/Tests/prepared-select-with-error-causes-hang.Jira-292.stable.out sql/test/mergetables/Tests/qlsmith-exist-lateral.reqtests Modified Files: .hgtags ChangeLog MonetDB.spec NT/mkodbcwxs.py NT/mksqlwxs.py NT/monetdb_config.h.in NT/rules.msc buildtools/doc/windowsbuild.rst clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/Makefile.ag clients/mapiclient/ReadlineTools.c clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/mapiclient/msqldump.c clients/mapilib/Makefile.ag clients/mapilib/mapi.rc clients/odbc/driver/ODBCConvert.c clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driv
MonetDB: mosaic - Merge with default.
Changeset: 5ea1d5700ef3 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5ea1d5700ef3 Added Files: debian/libmonetdb19.install sql/backends/monet5/sql_subquery.c sql/backends/monet5/sql_subquery.h sql/backends/monet5/sql_subquery.mal sql/benchmarks/arno/Tests/inserts.options5 sql/benchmarks/arno/Tests/inserts.reqtests sql/benchmarks/arno/Tests/inserts.sql.src sql/benchmarks/arno/Tests/inserts.stable.err sql/benchmarks/arno/Tests/inserts.stable.out sql/benchmarks/arno/inserts.sql sql/benchmarks/arno_flt/inserts.flt.sql sql/jdbc/tests/Tests/Bug_PrepStmt_With_Errors_Jira292.SQL.bat sql/jdbc/tests/Tests/Bug_PrepStmt_With_Errors_Jira292.SQL.sh sql/jdbc/tests/Tests/Bug_PrepStmt_With_Errors_Jira292.stable.err sql/jdbc/tests/Tests/Bug_PrepStmt_With_Errors_Jira292.stable.out sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.sql sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.stable.err sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.stable.out sql/test/BugTracker-2017/Tests/heapextend.Bug-6134.stable.err sql/test/BugTracker-2017/Tests/heapextend.Bug-6134.stable.out sql/test/BugTracker-2019/Tests/count-distinct.Bug-6790.sql sql/test/BugTracker-2019/Tests/count-distinct.Bug-6790.stable.err sql/test/BugTracker-2019/Tests/count-distinct.Bug-6790.stable.out sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.stable.err sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.stable.out sql/test/BugTracker-2019/Tests/jsonpath-validity.Bug-6792.sql sql/test/BugTracker-2019/Tests/jsonpath-validity.Bug-6792.stable.err sql/test/BugTracker-2019/Tests/jsonpath-validity.Bug-6792.stable.out sql/test/BugTracker-2019/Tests/prepared-select-with-error-causes-hang.Jira-292.sql sql/test/BugTracker-2019/Tests/prepared-select-with-error-causes-hang.Jira-292.stable.err sql/test/BugTracker-2019/Tests/prepared-select-with-error-causes-hang.Jira-292.stable.out sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.stable.out sql/test/BugTracker-2019/Tests/str_to_time.Bug-6791.sql sql/test/BugTracker-2019/Tests/str_to_time.Bug-6791.stable.err sql/test/BugTracker-2019/Tests/str_to_time.Bug-6791.stable.out sql/test/Tests/fsum1.stable.out sql/test/analytics/Tests/analytics10.sql sql/test/analytics/Tests/analytics10.stable.err sql/test/analytics/Tests/analytics10.stable.out sql/test/analytics/Tests/analytics11.sql sql/test/analytics/Tests/analytics11.stable.err sql/test/analytics/Tests/analytics11.stable.out sql/test/analytics/Tests/analytics12.sql sql/test/analytics/Tests/analytics12.stable.err sql/test/analytics/Tests/analytics12.stable.out sql/test/analytics/Tests/analytics13.sql sql/test/analytics/Tests/analytics13.stable.err sql/test/analytics/Tests/analytics13.stable.out sql/test/mapi/Tests/utf8test.stable.out.Windows sql/test/mergetables/Tests/sqlsmith-exists.stable.err sql/test/mergetables/Tests/sqlsmith-exists.stable.out sql/test/scanner/Tests/All sql/test/scanner/Tests/raw_strings.sql sql/test/scanner/Tests/raw_strings.stable.err sql/test/scanner/Tests/raw_strings.stable.out Removed Files: ChangeLog.Apr2019 buildtools/ChangeLog.Apr2019 buildtools/selinux/ChangeLog.Apr2019 clients/ChangeLog.Apr2019 clients/mapilib/ChangeLog.Apr2019 common/stream/ChangeLog.Apr2019 debian/libmonetdb18.install gdk/ChangeLog.Apr2019 geom/ChangeLog.Apr2019 monetdb5/ChangeLog.Apr2019 sql/ChangeLog.Apr2019 sql/benchmarks/arno/Tests/insert_ATOM.options5 sql/benchmarks/arno/Tests/insert_ATOM.reqtests sql/benchmarks/arno/Tests/insert_ATOM.sql.src sql/benchmarks/arno/Tests/insert_ATOM.stable.err sql/benchmarks/arno/Tests/insert_ATOM.stable.out sql/benchmarks/arno/Tests/insert_BOND.options5 sql/benchmarks/arno/Tests/insert_BOND.reqtests sql/benchmarks/arno/Tests/insert_BOND.sql.src sql/benchmarks/arno/Tests/insert_BOND.stable.err sql/benchmarks/arno/Tests/insert_BOND.stable.out sql/benchmarks/arno/Tests/insert_MODEL.reqtests sql/benchmarks/arno/Tests/insert_MODEL.sql.src sql/benchmarks/arno/Tests/insert_MODEL.stable.err sql/benchmarks/arno/Tests/insert_MODEL.stable.out sql/benchmarks/arno/insert_ATOM.int.sql sql/benchmarks/arno/insert_BOND.int.sql sql/benchmarks/arno/insert_MODEL.int.sql sql/benchmarks/arno_flt/insert_ATOM.flt.sql sql/benchmarks/arno_flt/insert_BOND.flt.sql sql/benchmarks/arno_flt/in
MonetDB: mosaic - Merge with default.
Changeset: bc8ee267dafe for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bc8ee267dafe Added Files: common/utils/mstring.h sql/backends/monet5/sql_session.c sql/backends/monet5/sql_session.h sql/backends/monet5/sql_session.mal sql/jdbc/tests/Tests/Bug_IsValid_Timeout_Bug_6782.SQL.bat sql/jdbc/tests/Tests/Bug_IsValid_Timeout_Bug_6782.SQL.sh sql/jdbc/tests/Tests/Bug_IsValid_Timeout_Bug_6782.stable.err sql/jdbc/tests/Tests/Bug_IsValid_Timeout_Bug_6782.stable.out sql/test/BugTracker-2019/Tests/avg-changes-value-scale.Bug-6783.sql sql/test/BugTracker-2019/Tests/avg-changes-value-scale.Bug-6783.stable.err sql/test/BugTracker-2019/Tests/avg-changes-value-scale.Bug-6783.stable.out sql/test/BugTracker-2019/Tests/index-insert-crash.Bug-6781.stable.err sql/test/BugTracker-2019/Tests/index-insert-crash.Bug-6781.stable.out sql/test/BugTracker-2019/Tests/isaUUID.Bug-6784.sql sql/test/BugTracker-2019/Tests/isaUUID.Bug-6784.stable.err sql/test/BugTracker-2019/Tests/isaUUID.Bug-6784.stable.out sql/test/Users/Tests/sessioncontrol.sql sql/test/Users/Tests/sessioncontrol.stable.err sql/test/Users/Tests/sessioncontrol.stable.out Removed Files: sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.sql sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.out Modified Files: .hgignore NT/Makefile NT/rules.msc buildtools/autogen/autogen/am.py buildtools/autogen/autogen/codegen.py buildtools/autogen/autogen/filesplit.py buildtools/autogen/autogen/msc.py buildtools/conf/rules.mk clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/examples/C/Makefile.ag clients/mapiclient/Makefile.ag clients/mapiclient/dump.c clients/mapiclient/msqldump.c clients/mapiclient/tomograph.c clients/mapilib/Makefile.ag clients/mapilib/mapi.c clients/odbc/driver/Makefile.ag clients/odbc/driver/ODBCError.c clients/odbc/driver/ODBCGlobal.h clients/odbc/driver/ODBCUtil.c clients/odbc/driver/ODBCUtil.h clients/odbc/driver/SQLBrowseConnect.c clients/odbc/driver/SQLConnect.c clients/odbc/driver/SQLDriverConnect.c clients/odbc/driver/SQLGetDiagField.c clients/odbc/driver/SQLGetDiagRec.c clients/odbc/setup/Makefile.ag clients/odbc/setup/drvcfg.c clients/odbc/winsetup/Makefile.ag common/stream/stream.c common/utils/Makefile.ag common/utils/msabaoth.c common/utils/msabaoth.h common/utils/mutils.c configure.ag gdk/gdk.h gdk/gdk_align.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_cand.c gdk/gdk_hash.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_orderidx.c gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_string.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_utils.c geom/monetdb5/geom.c monetdb5/ChangeLog monetdb5/mal/Tests/performanceTests/run monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_atom.c monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_exception.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_private.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resource.c monetdb5/mal/mal_resource.h monetdb5/mal/mal_runtime.c monetdb5/mal/mal_runtime.h monetdb5/mal/mal_session.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/str.c monetdb5/modules/atoms/strptime.c monetdb5/modules/atoms/url.c monetdb5/modules/atoms/uuid.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/modules/kernel/group.c monetdb5/modules/kernel/group.h monetdb5/modules/kernel/group.mal monetdb5/modules/mal/clients.c monetdb5/modules/mal/clients.mal monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/sysmon.mal sql/NT/dump-restore.rst sql/backends/monet5/Makefile.ag sql/backends/monet5/UDF/pyapi/pyapi.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.mal sql/b
MonetDB: mosaic - Merge with default.
Changeset: 3901399a1891 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3901399a1891 Added Files: sql/test/BugTracker-2019/Tests/index-insert-crash.Bug-6781.sql sql/test/BugTracker-2019/Tests/rank-nan.Bug-6780.sql sql/test/BugTracker-2019/Tests/rank-nan.Bug-6780.stable.err sql/test/BugTracker-2019/Tests/rank-nan.Bug-6780.stable.out sql/test/miscellaneous/Tests/select_groupby.sql sql/test/miscellaneous/Tests/select_groupby.stable.err sql/test/miscellaneous/Tests/select_groupby.stable.out Removed Files: clients/mapiclient/mnc.c sql/test/datacell/Tests/All sql/test/datacell/Tests/crashonundefined.sql sql/test/datacell/Tests/crashonundefined.stable.err sql/test/datacell/Tests/crashonundefined.stable.out sql/test/datacell/Tests/garbagecollect.sql sql/test/datacell/Tests/garbagecollect.stable.err sql/test/datacell/Tests/garbagecollect.stable.out sql/test/datacell/Tests/select.sql sql/test/datacell/Tests/select.stable.err sql/test/datacell/Tests/select.stable.out sql/test/datacell/Tests/topbasket.sql sql/test/datacell/Tests/topbasket.stable.err sql/test/datacell/Tests/topbasket.stable.out sql/test/miscellaneous/README sql/test/miscellaneous/Tests/now.sql sql/test/miscellaneous/Tests/now.stable.err Modified Files: ChangeLog NT/mkodbcwxs.py NT/mksqlwxs.py NT/monetdb_config.h.in clients/ChangeLog clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/Makefile.ag clients/mapiclient/dump.c clients/mapiclient/mhelp.c clients/mapiclient/msqldump.c common/utils/mutils.c configure.ag gdk/gdk_analytic_bounds.c gdk/gdk_analytic_func.c gdk/gdk_bbp.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_utils.c geom/monetdb5/geom.c geom/monetdb5/geom_upgrade.c monetdb5/mal/mal_builder.c monetdb5/mal/mal_builder.h monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_module.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_runtime.c monetdb5/modules/atoms/00_json_hge.mal monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime_analytic.c monetdb5/modules/mal/Tests/inspect05.stable.out.int128 monetdb5/modules/mal/Tests/mat.malC monetdb5/modules/mal/Tests/mat.stable.out monetdb5/modules/mal/clients.c monetdb5/modules/mal/clients.h monetdb5/modules/mal/clients.mal monetdb5/modules/mal/manual.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/mat.mal monetdb5/modules/mal/profiler.c monetdb5/modules/mal/profiler.mal monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/tokenizer.c monetdb5/optimizer/opt_pipes.c sql/ChangeLog.Nov2019 sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_rank.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_upgrades.h sql/backends/monet5/vaults/fits/fits.c sql/backends/monet5/vaults/shp/shp.c sql/common/sql_types.c sql/scripts/22_clients.sql sql/scripts/26_sysmon.sql sql/scripts/40_json.sql sql/scripts/99_system.sql sql/scripts/Makefile.ag sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_rel.c sql/server/rel_schema.c sql/server/rel_updates.c sql/server/sql_parser.y sql/server/sql_scan.c sql/storage/bat/bat_logger.c sql/storage/store.c sql/test/BugConstraints/Tests/check_constraint.SF-1714829.stable.err sql/test/BugDay_2005-12-19_2.9.3/Tests/default_next_value_for_non_ex_seq.SF.1246631.stable.err sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2012/Tests/create_function.Bug-3172.sql sql/test/BugTracker-2012/Tests/create_function.Bug-3172.stabl
MonetDB: mosaic - Merge with default.
Changeset: 2ee934954cc9 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ee934954cc9 Added Files: monetdb5/modules/mal/Tests/flags.malC monetdb5/modules/mal/Tests/flags.stable.err monetdb5/modules/mal/Tests/flags.stable.out sql/scripts/58_hot_snapshot.sql sql/scripts/61_wlcr.sql sql/test/BugTracker-2019/Tests/NOT_IN-AND-OR-wrong-results.Bug-6775.sql sql/test/BugTracker-2019/Tests/NOT_IN-AND-OR-wrong-results.Bug-6775.stable.err sql/test/BugTracker-2019/Tests/NOT_IN-AND-OR-wrong-results.Bug-6775.stable.out sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.sql sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.err sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.out sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.py sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.py sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.stable.err sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.stable.out sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.timeout sql/test/BugTracker-2019/Tests/next-get-value-bulk.Bug-6766.sql sql/test/BugTracker-2019/Tests/next-get-value-bulk.Bug-6766.stable.err sql/test/BugTracker-2019/Tests/next-get-value-bulk.Bug-6766.stable.out sql/test/BugTracker-2019/Tests/outer-join-varchar.Bug-6776.sql sql/test/BugTracker-2019/Tests/outer-join-varchar.Bug-6776.stable.err sql/test/BugTracker-2019/Tests/outer-join-varchar.Bug-6776.stable.out sql/test/BugTracker-2019/Tests/prod-decimals.Bug-6774.sql sql/test/BugTracker-2019/Tests/prod-decimals.Bug-6774.stable.err sql/test/BugTracker-2019/Tests/prod-decimals.Bug-6774.stable.out sql/test/BugTracker-2019/Tests/select-char.Bug-6761.sql sql/test/BugTracker-2019/Tests/select-char.Bug-6761.stable.err sql/test/BugTracker-2019/Tests/select-char.Bug-6761.stable.out sql/test/Dependencies/Tests/view_table_udf.sql sql/test/Dependencies/Tests/view_table_udf.stable.err sql/test/Dependencies/Tests/view_table_udf.stable.out sql/test/Tests/hot-snapshot.py sql/test/Tests/hot-snapshot.stable.err sql/test/Tests/hot-snapshot.stable.out sql/test/mergetables/Tests/sqlsmith-exists.sql sql/test/miscellaneous/Tests/alter_table_add_column.sql sql/test/miscellaneous/Tests/alter_table_add_column.stable.err sql/test/miscellaneous/Tests/alter_table_add_column.stable.out sql/test/miscellaneous/Tests/groupby_error.sql sql/test/miscellaneous/Tests/groupby_error.stable.err sql/test/miscellaneous/Tests/groupby_error.stable.out sql/test/miscellaneous/Tests/view-mul-digits.sql sql/test/miscellaneous/Tests/view-mul-digits.stable.err sql/test/miscellaneous/Tests/view-mul-digits.stable.out sql/test/subquery/Tests/exists.sql sql/test/subquery/Tests/exists.stable.err sql/test/subquery/Tests/exists.stable.out sql/test/subquery/Tests/subquery3.sql sql/test/subquery/Tests/subquery3.stable.err sql/test/subquery/Tests/subquery3.stable.out sql/test/wlcr/Tests/wlc80.py sql/test/wlcr/Tests/wlr10.py sql/test/wlcr/Tests/wlr10.stable.err sql/test/wlcr/Tests/wlr10.stable.out sql/test/wlcr/Tests/wlr80.py Removed Files: sql/scripts/11_times.sql Modified Files: ChangeLog Makefile.ag MonetDB.spec NT/mkodbcwxs.py NT/mksqlwxs.py NT/rules.msc buildtools/doc/HowToRelease.rst buildtools/doc/windowsbuild.rst clients/R/Tests/copy_into_fwf.stable.err clients/R/Tests/dbi.stable.err clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/Tests/stethoscope--help.stable.err clients/mapiclient/dump.c clients/mapiclient/eventparser.c clients/mapiclient/mhelp.c clients/mapiclient/stethoscope.c common/options/monet_options.c common/stream/stream.c common/utils/matomic.h configure.ag debian/control debian/fix-deb.sh debian/monetdb-testing-python.install debian/rules gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_analytic_func.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_calc.h gdk/gdk_group.c gdk/gdk_hash.c gdk/gdk_hash.h gdk/gdk_imprints.c gdk/gdk_logger.c gdk/gdk_mosaic.c gdk/gdk_orderidx.c gdk/gdk_private.h gdk/gdk_storage.c gdk/gdk_system.h gdk/gdk_
MonetDB: mosaic - Merge with default.
Changeset: ed99763ed02a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed99763ed02a Added Files: sql/test/BugTracker-2019/Tests/double-free.Bug-6757.sql sql/test/BugTracker-2019/Tests/double-free.Bug-6757.stable.err sql/test/BugTracker-2019/Tests/double-free.Bug-6757.stable.out sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.stable.err sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.stable.out Modified Files: clients/mapiclient/mclient.c gdk/gdk_bbp.c gdk/gdk_heap.c gdk/gdk_interprocess.c gdk/gdk_logger.c gdk/gdk_storage.c monetdb5/modules/mal/tablet.c sql/backends/monet5/UDF/pyapi/pyapi.c sql/backends/monet5/sql.c sql/backends/monet5/sql_upgrades.c sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_schema.c sql/server/rel_semantic.c sql/storage/store.c sql/test/BugTracker-2018/Tests/All sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out sql/test/BugTracker-2019/Tests/All sql/test/BugTracker-2019/Tests/cte-union.Bug-6755.stable.err sql/test/BugTracker-2019/Tests/cte-union.Bug-6755.stable.out sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.sql sql/test/BugTracker-2019/Tests/sequence-first-next-value.Bug-6743.stable.out sql/test/subquery/Tests/subquery2.sql sql/test/testdb-reload/Tests/reload.py testing/process.py tools/merovingian/daemon/controlrunner.c Branch: mosaic Log Message: Merge with default. diffs (truncated from 2876 to 300 lines): diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c --- a/clients/mapiclient/mclient.c +++ b/clients/mapiclient/mclient.c @@ -3664,6 +3664,9 @@ main(int argc, char **argv) if (mode == SQL) dump_version(mid, toConsole, "Database:"); + mnstr_printf(toConsole, "FOLLOW US on https://twitter.com/MonetDB "); + mnstr_printf(toConsole, "or https://github.com/MonetDB/MonetDB\n";); + mnstr_printf(toConsole, "Type \\q to quit, \\? for a list of available commands\n"); if (mode == SQL) mnstr_printf(toConsole, "auto commit mode: %s\n", diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c --- a/gdk/gdk_bbp.c +++ b/gdk/gdk_bbp.c @@ -1742,7 +1742,7 @@ BBPdir_subcommit(int cnt, bat *subcommit assert(subcommit[n - 1] < subcommit[n]); #endif - if ((nbbpf = GDKfilelocate(0, "BBP", "w", "dir")) == NULL) + if ((nbbpf = GDKfilelocate(0, "BBP", "wx", "dir")) == NULL) return GDK_FAIL; n = (bat) ATOMIC_GET(&BBPsize); @@ -1854,7 +1854,7 @@ BBPdir(int cnt, bat *subcommit) return BBPdir_subcommit(cnt, subcommit); IODEBUG fprintf(stderr, "#BBPdir: writing BBP.dir (%d bats).\n", (int) (bat) ATOMIC_GET(&BBPsize)); - if ((fp = GDKfilelocate(0, "BBP", "w", "dir")) == NULL) { + if ((fp = GDKfilelocate(0, "BBP", "wx", "dir")) == NULL) { goto bailout; } diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c --- a/gdk/gdk_heap.c +++ b/gdk/gdk_heap.c @@ -61,7 +61,7 @@ HEAPcreatefile(int farmid, size_t *maxsz fn = path; } /* round up to mulitple of GDK_mmap_pagesize */ - fd = GDKfdlocate(NOFARM, fn, "wb", NULL); + fd = GDKfdlocate(NOFARM, fn, "wxb", NULL); if (fd >= 0) { close(fd); base = GDKload(NOFARM, fn, NULL, *maxsz, maxsz, STORE_MMAP); @@ -119,36 +119,12 @@ HEAPalloc(Heap *h, size_t nitems, size_t } if (!GDKinmemory() && h->base == NULL) { char *nme; - struct stat st; - if(!(nme = GDKfilepath(h->farmid, BATDIR, h->filename, NULL))) { - GDKerror("HEAPalloc: malloc failure"); + nme = GDKfilepath(h->farmid, BATDIR, h->filename, NULL); + if (nme == NULL) return GDK_FAIL; - } - if (stat(nme, &st) < 0) { - h->storage = STORE_MMAP; - h->base = HEAPcreatefile(NOFARM, &h->size, nme); - } else { - int fd; - - fd = GDKfdlocate(NOFARM, nme, "wb", NULL); - if (fd >= 0) { - char of[sizeof(h->filename)]; - char *ext; - close(fd); - strncpy(of, h->filename, sizeof(of)); -#ifdef STATIC_CODE_ANALYSIS - /* help coverity
MonetDB: mosaic - Merge with default.
Changeset: 70724bc32be7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=70724bc32be7 Modified Files: NT/rules.msc configure.ag sql/backends/monet5/sql.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_upgrades.c sql/common/sql_types.c sql/common/sql_types.h sql/include/sql_catalog.h sql/server/rel_psm.c sql/server/rel_psm.h sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_unnest.c sql/server/rel_unnest.h sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_tokens.h sql/storage/sql_catalog.c sql/storage/sql_storage.h sql/storage/store.c sql/test/BugTracker-2009/Tests/All sql/test/BugTracker-2018/Tests/All sql/test/BugTracker/Tests/All sql/test/SQLite_regress/sqllogictest/sqllogictest.py testing/Mtest.py.in tools/merovingian/daemon/controlrunner.c Branch: mosaic Log Message: Merge with default. diffs (truncated from 1410 to 300 lines): diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -42,6 +42,7 @@ BITSMCHN=X64 # force W_CFLAGS off in debug builds: using icc, you get way more # warnings about casts which results in the code being uncompilable W_CFLAGS = +HAVE_MAL_DEBUGGER = 1 !ENDIF !IFDEF ENABLE_STRICT # strict mode: treat warnings as errors @@ -386,6 +387,11 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) HAVE_SHP_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF +!IFDEF HAVE_MAL_DEBUGGER + $(ECHO) HAVE_MAL_DEBUGGER_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" +!ELSE + $(ECHO) HAVE_MAL_DEBUGGER_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" +!ENDIF !IFDEF HAVE_SQL $(ECHO) HAVE_SQL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -838,6 +838,7 @@ AS_VAR_IF([enable_assert], [no], [ AC_MSG_RESULT([no])], [AC_MSG_RESULT([yes])]) +AM_CONDITIONAL([HAVE_MAL_DEBUGGER], [test "x$enable_assert" != xno]) AC_MSG_CHECKING([for --enable-optimize]) AS_CASE([$enable_optimize], [yes], [ diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c --- a/sql/backends/monet5/sql.c +++ b/sql/backends/monet5/sql.c @@ -284,7 +284,7 @@ create_table_or_view(mvc *sql, char* sna int check = 0; if (STORE_READONLY) - return sql_error(sql, 06, "25006!schema statements cannot be executed on a readonly database."); + return sql_error(sql, 06, SQLSTATE(25006) "schema statements cannot be executed on a readonly database."); if (!s) return sql_message(SQLSTATE(3F000) "CREATE %s: schema '%s' doesn't exist", (t->query) ? "TABLE" : "VIEW", sname); @@ -474,11 +474,11 @@ create_table_from_emit(Client cntxt, cha if (!sname) sname = "sys"; if (!(s = mvc_bind_schema(sql, sname))) { - msg = sql_error(sql, 02, "3F000!CREATE TABLE: no such schema '%s'", sname); + msg = sql_error(sql, 02, SQLSTATE(3F000) "CREATE TABLE: no such schema '%s'", sname); goto cleanup; } if (!(t = mvc_create_table(sql, s, tname, tt_table, 0, SQL_DECLARED_TABLE, CA_COMMIT, -1, 0))) { - msg = sql_error(sql, 02, "3F000!CREATE TABLE: could not create table '%s'", tname); + msg = sql_error(sql, 02, SQLSTATE(3F000) "CREATE TABLE: could not create table '%s'", tname); goto cleanup; } @@ -488,13 +488,13 @@ create_table_from_emit(Client cntxt, cha sql_column *col = NULL; if (!tpe) { - msg = sql_error(sql, 02, "3F000!CREATE TABLE: could not find type for column"); + msg = sql_error(sql, 02, SQLSTATE(3F000) "CREATE TABLE: could not find type for column"); goto cleanup; } col = mvc_create_column(sql, t, columns[i].name, tpe); if (!col) { - msg = sql_error(sql, 02, "3F000!CREATE TABLE: could not create column %s", columns[i].name); + msg = sql_error(sql, 02, SQLSTATE(3F000) "CREATE TABLE: could not create column %s", columns[i].name); goto cleanup; } } @@ -504,7 +504,7 @@ create_table_from_emit(Client cntxt, cha } t = mvc_bind_table(sql, s, tname); if (!t) { - msg = sql_error(sql, 02, "3F000!CREATE TABLE: could not bind table %s", tname); + msg = sql_error(sql, 02, SQLSTATE(3F000) "CREATE TABLE: could not bind table %s", tname); goto cleanup; } for(i = 0; i < ncols; i++) { @@ -513,7 +513,7 @@ create_table_from_emit(Client cntxt, cha col = mvc_bind_column(sql,t, columns[i].name)
MonetDB: mosaic - Merge with default.
Changeset: d116771b6b1e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d116771b6b1e Added Files: sql/test/SQLite_regress/sqllogictest/Tests/test1.SQL.bat sql/test/SQLite_regress/sqllogictest/Tests/test1.SQL.sh sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.err sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.err-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.out sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.out-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test1.timeout sql/test/SQLite_regress/sqllogictest/Tests/test2.SQL.bat sql/test/SQLite_regress/sqllogictest/Tests/test2.SQL.sh sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.err sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.err-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.out sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.out-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test2.timeout sql/test/SQLite_regress/sqllogictest/Tests/test3.SQL.bat sql/test/SQLite_regress/sqllogictest/Tests/test3.SQL.sh sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.err sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.err-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.out sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.out-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test3.timeout sql/test/SQLite_regress/sqllogictest/Tests/test4.SQL.bat sql/test/SQLite_regress/sqllogictest/Tests/test4.SQL.sh sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.err sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.err-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.out sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.out-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test4.timeout sql/test/SQLite_regress/sqllogictest/Tests/test5.SQL.bat sql/test/SQLite_regress/sqllogictest/Tests/test5.SQL.sh sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.err sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.err-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.out sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.out-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test5.timeout sql/test/SQLite_regress/sqllogictest/sqllogictest.py Removed Files: sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out.int128 sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out.int128 sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out.int128 sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out.int128 sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out.int128 sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out.int128 sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out.int128 sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out.int128 sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out.int128 sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.out.int128 sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out.int128 sql/test/SQLite_regress/sqllogictest/Tests/select1.test.sql sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.err sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out.int128 sql/test/SQLite_regress/sqllogictest/Tests/select1.test.timeout sql/test/SQLite_regress/sqllogictest/Tests/select2.test.sql sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.err sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.out.int128 sql/test/SQLite_regress/sqllogictest/Tests/select2.test.timeout sql/test/SQLite_regress/sqllogictest/Tests/select3.test.sql sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.err sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128 sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout sql/test/SQLite_regress/sqllogictest/Tests/select4.test.sql sql/test/SQLite_regress/sqllogictest/Tests/select4.test.stable.err sql/test/SQLite_regress/
MonetDB: mosaic - Merge with default.
Changeset: 2479817fcb9e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2479817fcb9e Added Files: ChangeLog.Nov2019 buildtools/ChangeLog.Nov2019 clients/ChangeLog.Nov2019 clients/mapilib/ChangeLog.Nov2019 common/stream/ChangeLog.Nov2019 gdk/ChangeLog.Nov2019 geom/ChangeLog.Nov2019 monetdb5/ChangeLog.Nov2019 sql/ChangeLog.Nov2019 sql/jdbc/tests/Tests/JdbcClient_create_tables.sql sql/jdbc/tests/Tests/JdbcClient_drop_tables.sql sql/jdbc/tests/Tests/JdbcClient_inserts_selects.sql sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.stable.err sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.stable.out sql/test/BugTracker-2019/Tests/cte-union.Bug-6755.sql sql/test/BugTracker-2019/Tests/cte-union.Bug-6755.stable.err sql/test/BugTracker-2019/Tests/cte-union.Bug-6755.stable.out sql/test/BugTracker-2019/Tests/merge-table-limit.Bug-6756.sql sql/test/BugTracker-2019/Tests/merge-table-limit.Bug-6756.stable.err sql/test/BugTracker-2019/Tests/merge-table-limit.Bug-6756.stable.out sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.py testing/ChangeLog.Nov2019 tools/merovingian/ChangeLog.Nov2019 Removed Files: sql/jdbc/tests/JdbcClient_create_tables.sql sql/jdbc/tests/JdbcClient_inserts_selects.sql 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/mapiclient/mhelp.c clients/mapilib/mapi.rc clients/odbc/driver/ODBCUtil.c clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc common/utils/msabaoth.c common/utils/msabaoth.h configure.ag debian/changelog debian/fix-deb.sh gdk/ChangeLog gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_analytic_func.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc.h gdk/gdk_calc_compare.h gdk/gdk_calc_private.h gdk/gdk_cand.c gdk/gdk_cand.h gdk/gdk_cross.c gdk/gdk_firstn.c gdk/gdk_group.c gdk/gdk_hash.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_posix.c gdk/gdk_posix.h gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_search.c gdk/gdk_select.c gdk/gdk_string.c gdk/gdk_system.c gdk/gdk_unique.c gdk/gdk_utils.c gdk/libbat.rc libversions monetdb5/ChangeLog monetdb5/mal/Tests/tst670.stable.err monetdb5/mal/mal.c monetdb5/mal/mal_client.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_import.c monetdb5/mal/mal_interpreter.c monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/uuid.c monetdb5/modules/atoms/uuid.mal monetdb5/modules/atoms/xml.c monetdb5/modules/atoms/xml.h monetdb5/modules/atoms/xml.mal monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/batmmath.c monetdb5/modules/mal/00_batcalc_hge.mal monetdb5/modules/mal/00_batcalc_hge.mal.sh monetdb5/modules/mal/01_batcalc.mal monetdb5/modules/mal/01_batcalc.mal.sh monetdb5/modules/mal/01_calc.mal monetdb5/modules/mal/01_calc.mal.sh monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/calc.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/orderidx.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/projectionpath.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/wlc.c monetdb5/modules/mal/wlc.h monetdb5/optimizer/opt_wlc.c monetdb5/tools/libmonetdb5.rc sql/ChangeLog sql/ChangeLog-Archive sql/ChangeLog.Apr2019 sql/backends/monet5/generator/generator.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/wlr.c sql/common/sql_types.c sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat sql/jdbc/tests/
MonetDB: mosaic - Merge with default.
Changeset: 6162482433b4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6162482433b4 Added Files: gdk/gdk_cand.c sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.malC sql/benchmarks/ATIS/Tests/load.options5 sql/benchmarks/arno/Tests/insert_ATOM.options5 sql/benchmarks/arno/Tests/insert_BOND.options5 sql/benchmarks/arno_flt/Tests/doAll.options5 sql/benchmarks/arno_flt/Tests/doAll_sorted.options5 sql/benchmarks/arno_flt/Tests/init.options5 sql/benchmarks/moa/Tests/load.options5 sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.SQL.bat sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.SQL.sh sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.err sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out.Darwin sql/test/BugTracker-2019/Tests/copy-into-unicode-quote.Bug-6716.sql sql/test/BugTracker-2019/Tests/copy-into-unicode-quote.Bug-6716.stable.err sql/test/BugTracker-2019/Tests/copy-into-unicode-quote.Bug-6716.stable.out sql/test/BugTracker-2019/Tests/correlated-subquery-aggregation.Bug-6714.sql sql/test/BugTracker-2019/Tests/correlated-subquery-aggregation.Bug-6714.stable.err sql/test/BugTracker-2019/Tests/correlated-subquery-aggregation.Bug-6714.stable.out sql/test/BugTracker-2019/Tests/disallow_duplicate_column_aliases.Bug-6723.sql sql/test/BugTracker-2019/Tests/disallow_duplicate_column_aliases.Bug-6723.stable.err sql/test/BugTracker-2019/Tests/disallow_duplicate_column_aliases.Bug-6723.stable.out sql/test/BugTracker-2019/Tests/insert-into-select.Bug-6718.sql sql/test/BugTracker-2019/Tests/insert-into-select.Bug-6718.stable.err sql/test/BugTracker-2019/Tests/insert-into-select.Bug-6718.stable.out sql/test/BugTracker-2019/Tests/merge-statement-aliases.Bug-6715.sql sql/test/BugTracker-2019/Tests/merge-statement-aliases.Bug-6715.stable.err sql/test/BugTracker-2019/Tests/merge-statement-aliases.Bug-6715.stable.out sql/test/BugTracker-2019/Tests/prepare-non-existing-function.Bug-6725.sql sql/test/BugTracker-2019/Tests/prepare-non-existing-function.Bug-6725.stable.err sql/test/BugTracker-2019/Tests/prepare-non-existing-function.Bug-6725.stable.out sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.sql sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.stable.err sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.stable.out sql/test/BugTracker-2019/Tests/prepared-merge-statement.Bug-6706.sql sql/test/BugTracker-2019/Tests/prepared-merge-statement.Bug-6706.stable.err sql/test/BugTracker-2019/Tests/prepared-merge-statement.Bug-6706.stable.out sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.sql sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.stable.err sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.stable.out sql/test/BugTracker-2019/Tests/select_window_function_and_asterisk.Bug-6722.sql sql/test/BugTracker-2019/Tests/select_window_function_and_asterisk.Bug-6722.stable.err sql/test/BugTracker-2019/Tests/select_window_function_and_asterisk.Bug-6722.stable.out sql/test/BugTracker-2019/Tests/sequence-first-next-value.Bug-6743.sql sql/test/BugTracker-2019/Tests/sequence-first-next-value.Bug-6743.stable.err sql/test/BugTracker-2019/Tests/sequence-first-next-value.Bug-6743.stable.out sql/test/BugTracker-2019/Tests/sequences-defaults.Bug-6744.sql sql/test/BugTracker-2019/Tests/sequences-defaults.Bug-6744.stable.err sql/test/BugTracker-2019/Tests/sequences-defaults.Bug-6744.stable.out sql/test/BugTracker-2019/Tests/sequences-types.Bug-6745.sql sql/test/BugTracker-2019/Tests/sequences-types.Bug-6745.stable.err sql/test/BugTracker-2019/Tests/sequences-types.Bug-6745.stable.out sql/test/BugTracker-2019/Tests/slow-inner-join.Bug-6737.sql sql/test/BugTracker-2019/Tests/slow-inner-join.Bug-6737.stable.err sql/test/BugTracker-2019/Tests/slow-inner-join.Bug-6737.stable.out sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.sql sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.err sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.out sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.out.int128 sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.sql sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.stable.err sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.stable.out sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.sql sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.err
MonetDB: mosaic - Merge with default.
Changeset: decdd4428f86 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=decdd4428f86 Added Files: ChangeLog.Apr2019 buildtools/ChangeLog.Apr2019 clients/ChangeLog.Apr2019 clients/mapilib/ChangeLog.Apr2019 common/stream/ChangeLog.Apr2019 gdk/ChangeLog.Apr2019 geom/ChangeLog.Apr2019 geom/sql/pg_regression/Tests/removeTmpFiles.SQL.py monetdb5/ChangeLog.Apr2019 monetdb5/modules/kernel/mmath_private.h sql/ChangeLog.Apr2019 sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat sql/benchmarks/tpcds/Tests/01.reqtests sql/benchmarks/tpcds/Tests/01.sql sql/benchmarks/tpcds/Tests/01.stable.err sql/benchmarks/tpcds/Tests/01.stable.out sql/benchmarks/tpcds/Tests/02.reqtests sql/benchmarks/tpcds/Tests/02.sql sql/benchmarks/tpcds/Tests/02.stable.err sql/benchmarks/tpcds/Tests/02.stable.out sql/benchmarks/tpcds/Tests/02.stable.out.int128 sql/benchmarks/tpcds/Tests/03.reqtests sql/benchmarks/tpcds/Tests/03.sql sql/benchmarks/tpcds/Tests/03.stable.err sql/benchmarks/tpcds/Tests/03.stable.out sql/benchmarks/tpcds/Tests/03.stable.out.int128 sql/benchmarks/tpcds/Tests/04.reqtests sql/benchmarks/tpcds/Tests/04.sql sql/benchmarks/tpcds/Tests/04.stable.err sql/benchmarks/tpcds/Tests/04.stable.out sql/benchmarks/tpcds/Tests/05.reqtests sql/benchmarks/tpcds/Tests/05.sql sql/benchmarks/tpcds/Tests/05.stable.err sql/benchmarks/tpcds/Tests/05.stable.out sql/benchmarks/tpcds/Tests/05.stable.out.int128 sql/benchmarks/tpcds/Tests/06.reqtests sql/benchmarks/tpcds/Tests/06.sql sql/benchmarks/tpcds/Tests/06.stable.err sql/benchmarks/tpcds/Tests/06.stable.out sql/benchmarks/tpcds/Tests/07.reqtests sql/benchmarks/tpcds/Tests/07.sql sql/benchmarks/tpcds/Tests/07.stable.err sql/benchmarks/tpcds/Tests/07.stable.out sql/benchmarks/tpcds/Tests/08.reqtests sql/benchmarks/tpcds/Tests/08.sql sql/benchmarks/tpcds/Tests/08.stable.err sql/benchmarks/tpcds/Tests/08.stable.out sql/benchmarks/tpcds/Tests/08.stable.out.int128 sql/benchmarks/tpcds/Tests/09.reqtests sql/benchmarks/tpcds/Tests/09.sql sql/benchmarks/tpcds/Tests/09.stable.err sql/benchmarks/tpcds/Tests/09.stable.out sql/benchmarks/tpcds/Tests/10.reqtests sql/benchmarks/tpcds/Tests/10.sql sql/benchmarks/tpcds/Tests/10.stable.err sql/benchmarks/tpcds/Tests/10.stable.out sql/benchmarks/tpcds/Tests/11.stable.err sql/benchmarks/tpcds/Tests/11.stable.out sql/benchmarks/tpcds/Tests/12.reqtests sql/benchmarks/tpcds/Tests/12.sql sql/benchmarks/tpcds/Tests/12.stable.err sql/benchmarks/tpcds/Tests/12.stable.out sql/benchmarks/tpcds/Tests/12.stable.out.int128 sql/benchmarks/tpcds/Tests/13.reqtests sql/benchmarks/tpcds/Tests/13.sql sql/benchmarks/tpcds/Tests/13.stable.err sql/benchmarks/tpcds/Tests/13.stable.out sql/benchmarks/tpcds/Tests/13.stable.out.int128 sql/benchmarks/tpcds/Tests/14a.reqtests sql/benchmarks/tpcds/Tests/14a.sql sql/benchmarks/tpcds/Tests/14a.stable.err sql/benchmarks/tpcds/Tests/14a.stable.out sql/benchmarks/tpcds/Tests/14a.stable.out.int128 sql/benchmarks/tpcds/Tests/14b.reqtests sql/benchmarks/tpcds/Tests/14b.sql sql/benchmarks/tpcds/Tests/14b.stable.err sql/benchmarks/tpcds/Tests/14b.stable.out sql/benchmarks/tpcds/Tests/14b.stable.out.int128 sql/benchmarks/tpcds/Tests/15.reqtests sql/benchmarks/tpcds/Tests/15.sql sql/benchmarks/tpcds/Tests/15.stable.err sql/benchmarks/tpcds/Tests/15.stable.out sql/benchmarks/tpcds/Tests/15.stable.out.int128 sql/benchmarks/tpcds/Tests/16.reqtests sql/benchmarks/tpcds/Tests/16.sql sql/benchmarks/tpcds/Tests/16.stable.err sql/benchmarks/tpcds/Tests/16.stable.out sql/benchmarks/tpcds/Tests/16.stable.out.int128 sql/benchmarks/tpcds/Tests/17.reqtests sql/benchmarks/tpcds/Tests/17.sql sql/benchmarks/tpcds/Tests/17.stable.err sql/benchmarks/tpcds/Tests/17.stable.out sql/benchmarks/tpcds/Tests/18.reqtests sql/benchmarks/tpcds/Tests/18.sql sql/benchmarks/tpcds/Tests/18.stable.err sql/benchmarks/tpcds/Tests/18.stable.out sql/benchmarks/tpcds/Tests/18.stable.out.int128 sql/benchmarks/tpcds/Tests/19.reqtests sql/benchmarks/tpcds/Tests/19.sql sql/benchmarks/tpcds/Tests/19.stable.err sql/benchmarks/tpcds/Tests/19.stable.out sql/benchmarks/tpcds/Tests/19.stable.out.int128
MonetDB: mosaic - Merge with default.
Changeset: 03aae130057c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=03aae130057c Added Files: sql/test/BugTracker-2018/Tests/copy-into-doubled.Bug-.sql sql/test/BugTracker-2018/Tests/copy-into-doubled.Bug-.stable.err sql/test/BugTracker-2018/Tests/copy-into-doubled.Bug-.stable.out sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.sql sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.stable.err sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.stable.out sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.sql sql/test/BugTracker-2018/Tests/negative-sequences.Bug-6665.sql sql/test/BugTracker-2018/Tests/negative-sequences.Bug-6665.stable.err sql/test/BugTracker-2018/Tests/negative-sequences.Bug-6665.stable.out Modified Files: NT/wincompile.py clients/Tests/exports.stable.out clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/mapiclient/msqldump.h common/stream/stream.c gdk/gdk.h gdk/gdk_align.c gdk/gdk_analytic_func.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_cross.c gdk/gdk_delta.c gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_orderidx.c gdk/gdk_posix.c gdk/gdk_posix.h gdk/gdk_project.c gdk/gdk_sample.c gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_string.c gdk/gdk_tm.c gdk/gdk_unique.c geom/monetdb5/geom.c monetdb5/extras/rapi/converters.c.h monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mtime.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/batstr.c monetdb5/modules/kernel/microbenchmark.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/mkey.c monetdb5/modules/mal/orderidx.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c monetdb5/optimizer/opt_prelude.c sql/backends/monet5/UDF/capi/capi.c sql/backends/monet5/UDF/pyapi/conversion.c sql/backends/monet5/UDF/pyapi/convert_loops.h sql/backends/monet5/UDF/pyapi/emit.c sql/backends/monet5/UDF/pyapi/pyloader.c sql/backends/monet5/UDF/udf/udf.c sql/backends/monet5/generator/generator.c sql/backends/monet5/sql.c sql/backends/monet5/sql_cast_impl_up_to_flt.h sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_fround_impl.h sql/backends/monet5/sql_rank.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_round_impl.h sql/backends/monet5/vaults/bam/bam_lib.c sql/backends/monet5/vaults/fits/fits.c sql/backends/monet5/vaults/lidar/lidar.c sql/backends/monet5/vaults/netcdf/netcdf.c sql/scripts/75_storagemodel.sql sql/server/rel_propagate.c sql/server/rel_psm.c sql/server/rel_schema.c sql/server/rel_sequence.c sql/server/rel_updates.c sql/server/sql_mvc.c sql/server/sql_parser.y sql/server/sql_scan.c sql/server/sql_semantic.c sql/storage/sql_catalog.c sql/storage/store.c sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.err sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.out sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.sql sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.stable.err sql/test/BugTracker-2018/Tests/All sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/Dependencies/Tests/dependency_loop.stable.out sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb/Tests/check.stable.out
MonetDB: mosaic - Merge with default.
Changeset: 9f19837b06aa for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f19837b06aa Added Files: gdk/gdk_analytic.h gdk/gdk_analytic_bounds.c gdk/gdk_analytic_func.c monetdb5/modules/atoms/mtime_analytic.c monetdb5/modules/atoms/strptime.c sql/backends/monet5/sql_rank.mal.sh sql/backends/monet5/sql_rank_hge.mal sql/backends/monet5/sql_rank_hge.mal.sh sql/test/analytics/Tests/All sql/test/analytics/Tests/analytics00.sql sql/test/analytics/Tests/analytics00.stable.err sql/test/analytics/Tests/analytics00.stable.out sql/test/analytics/Tests/analytics01.sql sql/test/analytics/Tests/analytics01.stable.err sql/test/analytics/Tests/analytics01.stable.out sql/test/analytics/Tests/analytics02.sql sql/test/analytics/Tests/analytics02.stable.err sql/test/analytics/Tests/analytics02.stable.out sql/test/analytics/Tests/analytics03.sql sql/test/analytics/Tests/analytics03.stable.err sql/test/analytics/Tests/analytics03.stable.out sql/test/analytics/Tests/analytics04.sql sql/test/analytics/Tests/analytics04.stable.err sql/test/analytics/Tests/analytics04.stable.out sql/test/analytics/Tests/analytics05.sql sql/test/analytics/Tests/analytics05.stable.err sql/test/analytics/Tests/analytics05.stable.out sql/test/analytics/Tests/analytics06.sql sql/test/analytics/Tests/analytics06.stable.err sql/test/analytics/Tests/analytics06.stable.out sql/test/analytics/Tests/analytics07.sql sql/test/analytics/Tests/analytics07.stable.err sql/test/analytics/Tests/analytics07.stable.out sql/test/analytics/Tests/analytics08.sql sql/test/analytics/Tests/analytics08.stable.err sql/test/analytics/Tests/analytics08.stable.out sql/test/analytics/Tests/analytics09.sql sql/test/analytics/Tests/analytics09.stable.err sql/test/analytics/Tests/analytics09.stable.out sql/test/miscellaneous/Tests/simple_selects.sql sql/test/miscellaneous/Tests/simple_selects.stable.err sql/test/miscellaneous/Tests/simple_selects.stable.out Removed Files: common/utils/strptime.cpp Modified Files: NT/rules.msc clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/examples/perl/countries.sql clients/mapiclient/dump.c clients/mapiclient/mhelp.c clients/odbc/driver/SQLGetInfo.c common/utils/Makefile.ag gdk/Makefile.ag gdk/gdk_aggr.c gdk/gdk_bbp.c gdk/gdk_calc_private.h gdk/gdk_heap.c geom/BugTracker/Tests/copy_into_crash.SF-1975402.sql geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err geom/sql/pg_regression/Tests/binary.sql.in geom/sql/pg_regression/Tests/clean.sql monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/modules/atoms/Makefile.ag monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/mal/Makefile.ag monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_support.c monetdb5/tools/Makefile.ag sql/ChangeLog sql/backends/monet5/Makefile.ag sql/backends/monet5/Tests/limithack.sql sql/backends/monet5/Tests/rapi15.sql sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_hge.mal sql/backends/monet5/sql_rank.c sql/backends/monet5/sql_rank.h sql/backends/monet5/sql_rank.mal sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_user.c sql/benchmarks/ATIS/load.sql sql/benchmarks/VOC/voc_dump.sql sql/benchmarks/alex/load.sql sql/benchmarks/arno/load.int.sql sql/benchmarks/arno_flt/load.flt.sql sql/benchmarks/hist-uva/ground/load.sql sql/benchmarks/moa/load1.sql sql/benchmarks/ssbm/Tests/load-sf-0.01.sql sql/benchmarks/tpcds/Tests/load.sql.in sql/benchmarks/tpch/load-sf-0.01-LOCKED.sql sql/benchmarks/tpch/load-sf-0.01.sql sql/benchmarks/tpch/load-sf-1.sql sql/benchmarks/viam/Tests/dump.sql sql/common/sql_backend.c sql/common/sql_backend.h sql/common/sql_types.c sql/common/sql_types.h sql/include/sql_catalog.h sql/scripts/51_sys_schema_extension.
MonetDB: mosaic - Merge with default.
Changeset: b76ca2d7379a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b76ca2d7379a Added Files: sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.py sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.err sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.out sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.stable.err sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.out.int128 sql/test/testdb-reload/Tests/All sql/test/testdb-reload/Tests/reload.py sql/test/testdb-reload/Tests/reload.stable.err sql/test/testdb-reload/Tests/reload.stable.out sql/test/testdb-reload/Tests/reload.timeout Modified Files: clients/Tests/exports.stable.out clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/mapiclient/msqldump.c gdk/ChangeLog gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_private.h gdk/gdk_storage.c gdk/gdk_string.c gdk/gdk_system.c gdk/gdk_utils.c gdk/gdk_value.c geom/monetdb5/geom.c geom/monetdb5/geom.h geom/sql/conformance/Tests/T13.stable.out geom/sql/conformance/Tests/T14.stable.out geom/sql/conformance/Tests/T17.stable.out geom/sql/conformance/Tests/T18.stable.out geom/sql/conformance/Tests/T23.stable.out geom/sql/conformance/Tests/T24.stable.out geom/sql/conformance/Tests/T27.stable.out geom/sql/conformance/Tests/T29.stable.out geom/sql/conformance/Tests/T31.stable.out geom/sql/conformance/Tests/T34.stable.out geom/sql/conformance/Tests/T47.stable.out geom/sql/conformance/Tests/T48.stable.out geom/sql/conformance/Tests/T49.stable.out geom/sql/conformance/Tests/T50.stable.out geom/sql/conformance/Tests/T52.stable.out geom/sql/conformance/Tests/T8.stable.out geom/sql/functions/Tests/ST_AsEWKT.stable.out geom/sql/functions/Tests/ST_AsText.stable.out geom/sql/pg_regression/Tests/boundary.stable.out geom/sql/pg_regression/Tests/delaunaytriangles.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/mal/Tests/tst1200.stable.out monetdb5/mal/Tests/tst1205.stable.out monetdb5/mal/mal_atom.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_profiler.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/blob.h monetdb5/modules/atoms/color.c monetdb5/modules/atoms/color.h monetdb5/modules/atoms/identifier.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/json.h monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/atoms/url.c monetdb5/modules/atoms/url.h monetdb5/modules/atoms/uuid.c monetdb5/modules/atoms/xml.c monetdb5/modules/atoms/xml.h monetdb5/modules/kernel/algebra.mal monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c rpm.mk.in sql/backends/monet5/UDF/capi/capi.c sql/backends/monet5/UDF/pyapi/conversion.c sql/backends/monet5/UDF/pyapi/convert_loops.h sql/backends/monet5/UDF/pyapi/type_conversion.c sql/backends/monet5/sql.c sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_result.h sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128 sql/backends/monet5/wlr.c sql/common/sql_string.c sql/common/sql_string.h sql/include/sql_catalog.h sql/jdbc/tests/Tests/BugResultSetMetaData_Bug_6183.stable.out sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_psm.c sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_atom.c sql/server/sql_parser.y sql/server/sql_p
MonetDB: mosaic - Merge with default.
Changeset: feb5440b8f81 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=feb5440b8f81 Added Files: common/utils/revision.c gdk/gdk_string.c sql/benchmarks/tpcds/Tests/11.reqtests sql/benchmarks/tpcds/Tests/11.sql sql/benchmarks/tpcds/Tests/38.reqtests sql/benchmarks/tpcds/Tests/38.sql sql/benchmarks/tpcds/Tests/72.reqtests sql/benchmarks/tpcds/Tests/72.sql sql/benchmarks/tpcds/Tests/83.reqtests sql/benchmarks/tpcds/Tests/83.sql sql/benchmarks/tpcds/Tests/98.reqtests sql/benchmarks/tpcds/Tests/98.sql sql/benchmarks/tpcds/Tests/99.reqtests sql/benchmarks/tpcds/Tests/99.sql sql/benchmarks/tpcds/Tests/All sql/benchmarks/tpcds/Tests/alter.reqtests sql/benchmarks/tpcds/Tests/alter.sql sql/benchmarks/tpcds/Tests/alter.stable.err sql/benchmarks/tpcds/Tests/alter.stable.out sql/benchmarks/tpcds/Tests/check0.reqtests sql/benchmarks/tpcds/Tests/check0.sql sql/benchmarks/tpcds/Tests/check0.stable.err sql/benchmarks/tpcds/Tests/check0.stable.out sql/benchmarks/tpcds/Tests/check1.reqtests sql/benchmarks/tpcds/Tests/check1.sql sql/benchmarks/tpcds/Tests/check1.stable.err sql/benchmarks/tpcds/Tests/check1.stable.out sql/benchmarks/tpcds/Tests/create.sql sql/benchmarks/tpcds/Tests/create.stable.err sql/benchmarks/tpcds/Tests/create.stable.out sql/benchmarks/tpcds/Tests/drop.sql sql/benchmarks/tpcds/Tests/drop.stable.err sql/benchmarks/tpcds/Tests/drop.stable.out sql/benchmarks/tpcds/Tests/load.reqtests sql/benchmarks/tpcds/Tests/load.sql.in sql/benchmarks/tpcds/Tests/load.stable.err sql/benchmarks/tpcds/Tests/load.stable.out sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.options5 sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.options5 sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.sql sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.stable.err sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.stable.out sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.sql sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.stable.err sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.stable.out sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.sql sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.stable.err sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.stable.out sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.sql sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.stable.err sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.stable.out sql/test/BugTracker-2018/Tests/quantile-crash.Bug-6658.sql sql/test/BugTracker-2018/Tests/quantile-crash.Bug-6658.stable.err sql/test/BugTracker-2018/Tests/quantile-crash.Bug-6658.stable.out sql/test/BugTracker-2018/Tests/select_where_true.Bug-6654.sql sql/test/BugTracker-2018/Tests/select_where_true.Bug-6654.stable.err sql/test/BugTracker-2018/Tests/select_where_true.Bug-6654.stable.out sql/test/rename/Tests/All sql/test/rename/Tests/rename00.py sql/test/rename/Tests/rename00.stable.err sql/test/rename/Tests/rename00.stable.out sql/test/rename/Tests/rename01.sql sql/test/rename/Tests/rename01.stable.err sql/test/rename/Tests/rename01.stable.out sql/test/rename/Tests/rename02.sql sql/test/rename/Tests/rename02.stable.err sql/test/rename/Tests/rename02.stable.out sql/test/rename/Tests/rename03.sql sql/test/rename/Tests/rename03.stable.err sql/test/rename/Tests/rename03.stable.out sql/test/rename/Tests/rename04.sql sql/test/rename/Tests/rename04.stable.err sql/test/rename/Tests/rename04.stable.out sql/test/rename/Tests/rename05.sql sql/test/rename/Tests/rename05.stable.err sql/test/rename/Tests/rename05.stable.out sql/test/rename/Tests/rename06.sql sql/test/rename/Tests/rename06.stable.err sql/test/rename/Tests/rename06.stable.out sql/test/testdb/Tests/dump-nogeom.reqtests sql/test/testdb/Tests/dump-nogeom.sql sql/test/testdb/Tests/dump-nogeom.stable.err sql/test/testdb/Tests/dump-nogeom.stable.out sql/test/testdb/Tests/dump.reqtests sql/test/testdb/Tests/dump.sql sql/test/testdb/Tests/dump.stable.err sql/test/testdb/Tests/dump.stable.out sql/test/testdb/Tests/dump.timeout sql/test/testdb/Tests/load-geom.reqtests sql/test/testdb/Tests/load-geom.sql
MonetDB: mosaic - Merge with default
Changeset: 5105b98d08e4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5105b98d08e4 Added Files: ChangeLog.Aug2018 buildtools/ChangeLog.Aug2018 clients/ChangeLog.Aug2018 clients/R/Tests/deps-install.timeout clients/mapilib/ChangeLog.Aug2018 clients/odbc/samples/testStmtAttr.c common/stream/ChangeLog.Aug2018 common/utils/strptime.cpp debian/libmonetdb17.install debian/libmonetdb5-server-cfitsio.install debian/monetdb-python3.install gdk/ChangeLog.Aug2018 gdk/xoshiro256starstar.h geom/ChangeLog.Aug2018 monetdb5/ChangeLog.Aug2018 sql/ChangeLog.Aug2018 sql/backends/monet5/UDF/capi/Tests/capi14.sql sql/backends/monet5/UDF/capi/Tests/capi14.stable.err sql/backends/monet5/UDF/capi/Tests/capi14.stable.out sql/backends/monet5/UDF/capi/Tests/capi15.sql sql/backends/monet5/UDF/capi/Tests/capi15.stable.err sql/backends/monet5/UDF/capi/Tests/capi15.stable.out sql/backends/monet5/UDF/capi/Tests/capi16.sql sql/backends/monet5/UDF/capi/Tests/capi16.stable.err sql/backends/monet5/UDF/capi/Tests/capi16.stable.out sql/backends/monet5/UDF/capi/Tests/capi17.sql sql/backends/monet5/UDF/capi/Tests/capi17.stable.err sql/backends/monet5/UDF/capi/Tests/capi17.stable.out sql/backends/monet5/UDF/capi/Tests/capi18.sql sql/backends/monet5/UDF/capi/Tests/capi18.stable.err sql/backends/monet5/UDF/capi/Tests/capi18.stable.out sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh sql/jdbc/tests/Tests/SQLcopyinto.stable.err sql/jdbc/tests/Tests/SQLcopyinto.stable.out sql/server/rel_propagate.c sql/server/rel_propagate.h sql/server/sql_partition.c sql/server/sql_partition.h sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.sql sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.err sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.out sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.sql sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.stable.err sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.stable.out sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.sql sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.stable.err sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.stable.out sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.sql sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.err sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.out sql/test/BugTracker-2018/Tests/create-temp-table-ordered-index-error.Bug-6574.sql sql/test/BugTracker-2018/Tests/create-temp-table-ordered-index-error.Bug-6574.stable.err sql/test/BugTracker-2018/Tests/create-temp-table-ordered-index-error.Bug-6574.stable.out sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.sql sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.err sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.out sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.err sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.out sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.sql sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.err sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.sql sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.err sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.out sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.err sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.out sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.sql sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.err sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.out sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.sql sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.stable.err sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.stable.out sql/test/BugTracker-2018/Tests/mult
MonetDB: mosaic - Merge with default
Changeset: 967c2584fdea for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=967c2584fdea Added Files: monetdb5/optimizer/opt_postfix.c monetdb5/optimizer/opt_postfix.h sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.sql sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.stable.err sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.stable.out sql/test/BugTracker-2017/Tests/select-in-returns-null.Bug-6491.sql sql/test/BugTracker-2017/Tests/select-in-returns-null.Bug-6491.stable.err sql/test/BugTracker-2017/Tests/select-in-returns-null.Bug-6491.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-algebra-operators.Bug-6494.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-algebra-operators.Bug-6494.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-comparisons-between-floating-points-and-NULL.Bug-6496.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-comparisons-between-floating-points-and-NULL.Bug-6496.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-hidden-alias.Bug-6495.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-hidden-alias.Bug-6495.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-min-distinct-empty-table.Bug-6493.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-min-distinct-empty-table.Bug-6493.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-not-between.Bug-6497.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-not-between.Bug-6497.stable.out sql/test/BugTracker-2017/Tests/union_all_null.Bug-6487.sql sql/test/BugTracker-2017/Tests/union_all_null.Bug-6487.stable.err sql/test/BugTracker-2017/Tests/union_all_null.Bug-6487.stable.out Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out gdk/gdk_search.c monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/optimizer/Makefile.ag monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_wrapper.c monetdb5/optimizer/optimizer.mal sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_upgrades.c sql/common/sql_types.c sql/jdbc/tests/Tests/Test_Rtimedate.stable.out sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_select.c sql/server/sql_atom.c sql/server/sql_parser.y sql/server/sql_qc.c sql/server/sql_qc.h sql/server/sql_semantic.h sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out sql/test/BugTracker-2012/Tests/null_except_null.Bug-3040.stable.out sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err.int128 sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out.int128 sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out.int128 sql/test/BugTracker-2016/Tests/select-in-from.Bug-6121.stable.out sql/test/BugTracker-2017/Tests/All sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.stable.out sql/test/BugTracker-2017/Tests/limit.Bug-6322.stable.out sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-comparisons-between-floating-points-and-NULL.Bug-6496.sql sql/test/BugTracker-2017/Tests/sqlitelogictest-select-in-column.Bug-6490.stable.out sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.stable.err sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.stable.out sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.stable.err sql/test/Tests/setoptimizer.stable.out sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out sql/test/bugs/Tests/union_all-bug-sf-941788.stable.out sql/test/mapi/Tests/sql_int128.stable.out.int128 sql/test/mergetables/Tests/mergequery.stable.o
MonetDB: mosaic - Merge with default
Changeset: b32aca7ce4ed for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b32aca7ce4ed Added Files: sql/backends/monet5/Tests/pyloader06.stable.out.32bit sql/backends/monet5/Tests/pyloader07.stable.out.32bit sql/backends/monet5/UDF/capi/50_capi.mal sql/backends/monet5/UDF/capi/Makefile.ag sql/backends/monet5/UDF/capi/Tests/All sql/backends/monet5/UDF/capi/Tests/capi00.sql sql/backends/monet5/UDF/capi/Tests/capi00.stable.err sql/backends/monet5/UDF/capi/Tests/capi00.stable.out sql/backends/monet5/UDF/capi/Tests/capi01.sql sql/backends/monet5/UDF/capi/Tests/capi01.stable.err sql/backends/monet5/UDF/capi/Tests/capi01.stable.out sql/backends/monet5/UDF/capi/Tests/capi02.sql sql/backends/monet5/UDF/capi/Tests/capi02.stable.err sql/backends/monet5/UDF/capi/Tests/capi02.stable.out sql/backends/monet5/UDF/capi/Tests/capi03.sql sql/backends/monet5/UDF/capi/Tests/capi03.stable.err sql/backends/monet5/UDF/capi/Tests/capi03.stable.out sql/backends/monet5/UDF/capi/Tests/capi04.sql sql/backends/monet5/UDF/capi/Tests/capi04.stable.err sql/backends/monet5/UDF/capi/Tests/capi04.stable.out sql/backends/monet5/UDF/capi/Tests/capi05.sql sql/backends/monet5/UDF/capi/Tests/capi05.stable.err sql/backends/monet5/UDF/capi/Tests/capi05.stable.out sql/backends/monet5/UDF/capi/Tests/capi06.sql sql/backends/monet5/UDF/capi/Tests/capi06.stable.err sql/backends/monet5/UDF/capi/Tests/capi06.stable.out sql/backends/monet5/UDF/capi/Tests/capi07.sql sql/backends/monet5/UDF/capi/Tests/capi07.stable.err sql/backends/monet5/UDF/capi/Tests/capi07.stable.out sql/backends/monet5/UDF/capi/Tests/capi08.sql sql/backends/monet5/UDF/capi/Tests/capi08.stable.err sql/backends/monet5/UDF/capi/Tests/capi08.stable.out sql/backends/monet5/UDF/capi/Tests/capi09.sql sql/backends/monet5/UDF/capi/Tests/capi09.stable.err sql/backends/monet5/UDF/capi/Tests/capi09.stable.out sql/backends/monet5/UDF/capi/Tests/capi10.sql sql/backends/monet5/UDF/capi/Tests/capi10.stable.err sql/backends/monet5/UDF/capi/Tests/capi10.stable.out sql/backends/monet5/UDF/capi/Tests/capi11.sql sql/backends/monet5/UDF/capi/Tests/capi11.stable.err sql/backends/monet5/UDF/capi/Tests/capi11.stable.out sql/backends/monet5/UDF/capi/Tests/capi12.sql sql/backends/monet5/UDF/capi/Tests/capi12.stable.err sql/backends/monet5/UDF/capi/Tests/capi12.stable.out sql/backends/monet5/UDF/capi/Tests/capi13.sql sql/backends/monet5/UDF/capi/Tests/capi13.stable.err sql/backends/monet5/UDF/capi/Tests/capi13.stable.out sql/backends/monet5/UDF/capi/capi.c sql/backends/monet5/UDF/capi/capi.h sql/backends/monet5/UDF/capi/capi.mal sql/backends/monet5/UDF/capi/cheader.h sql/backends/monet5/UDF/udf/80_udf.mal sql/backends/monet5/UDF/udf/80_udf.sql sql/backends/monet5/UDF/udf/80_udf_hge.mal sql/backends/monet5/UDF/udf/80_udf_hge.sql sql/backends/monet5/UDF/udf/Makefile.ag sql/backends/monet5/UDF/udf/README sql/backends/monet5/UDF/udf/Tests/All sql/backends/monet5/UDF/udf/Tests/udf-fuse.sql sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.err sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/udf/Tests/udf-reverse.sql sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.err sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out sql/backends/monet5/UDF/udf/udf.c sql/backends/monet5/UDF/udf/udf.h sql/backends/monet5/UDF/udf/udf.mal sql/backends/monet5/UDF/udf/udf_hge.mal sql/backends/monet5/UDF/udf/udf_impl.h sql/test/BugTracker-2017/Tests/function-resolution.Bug-6436.sql sql/test/BugTracker-2017/Tests/function-resolution.Bug-6436.stable.err sql/test/BugTracker-2017/Tests/function-resolution.Bug-6436.stable.out sql/test/BugTracker-2017/Tests/generate-resolution.Bug-6471.sql sql/test/BugTracker-2017/Tests/generate-resolution.Bug-6471.stable.err sql/test/BugTracker-2017/Tests/generate-resolution.Bug-6471.stable.out sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.stable.err sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.stable.out sql/test/BugTracker-2017/Tests/parsererror.Bug-6381.stable.err sql/test/BugTracker-2017/Tests/parsererror.Bug-6381.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-algebra-operators.Bug-6494.sql sql/test/BugTracker-2017/Tests/sqlitelogictest-comparisons-between-floating-points-and-NULL.Bug-6496.sql sql/test/BugTracker-2017/Tests/sqlitelogictest-hidden-alias.Bug-6495.sql
MonetDB: mosaic - Merge with default
Changeset: fd2256c08f15 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd2256c08f15 Added Files: sql/test/BugTracker-2017/Tests/check_system_schema.Bug-6437.sql sql/test/BugTracker-2017/Tests/check_system_schema.Bug-6437.stable.err sql/test/BugTracker-2017/Tests/check_system_schema.Bug-6437.stable.out sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.sql sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.err sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out sql/test/BugTracker-2017/Tests/crash-in-topn.Bug-6478.sql sql/test/BugTracker-2017/Tests/crash-in-topn.Bug-6478.stable.err sql/test/BugTracker-2017/Tests/crash-in-topn.Bug-6478.stable.out sql/test/BugTracker-2017/Tests/date_to_str.Bug-6467.sql sql/test/BugTracker-2017/Tests/date_to_str.Bug-6467.stable.err sql/test/BugTracker-2017/Tests/date_to_str.Bug-6467.stable.out sql/test/BugTracker-2017/Tests/drop_schema_restrict.Bug-6438.sql sql/test/BugTracker-2017/Tests/drop_schema_restrict.Bug-6438.stable.err sql/test/BugTracker-2017/Tests/drop_schema_restrict.Bug-6438.stable.out sql/test/BugTracker-2017/Tests/drop_system_schema.Bug-6437.sql sql/test/BugTracker-2017/Tests/drop_system_schema.Bug-6437.stable.err sql/test/BugTracker-2017/Tests/drop_system_schema.Bug-6437.stable.out sql/test/BugTracker-2017/Tests/limit.Bug-6322.sql sql/test/BugTracker-2017/Tests/limit.Bug-6322.stable.err sql/test/BugTracker-2017/Tests/limit.Bug-6322.stable.out sql/test/BugTracker-2017/Tests/python_loader_clobbers_default_with_null.Bug-6464.sql sql/test/BugTracker-2017/Tests/python_loader_clobbers_default_with_null.Bug-6464.stable.err sql/test/BugTracker-2017/Tests/python_loader_clobbers_default_with_null.Bug-6464.stable.out sql/test/BugTracker-2017/Tests/skip_problem_best_effort.Bug-6442.sql sql/test/BugTracker-2017/Tests/skip_problem_best_effort.Bug-6442.stable.err sql/test/BugTracker-2017/Tests/skip_problem_best_effort.Bug-6442.stable.out sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6477.sql sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6477.stable.err sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6477.stable.out sql/test/BugTracker-2017/Tests/update_on_procedure.Bug-6479.sql sql/test/BugTracker-2017/Tests/update_on_procedure.Bug-6479.stable.err sql/test/BugTracker-2017/Tests/update_on_procedure.Bug-6479.stable.out sql/test/mergetables/Tests/mergedb.Bug-6820.reqtests sql/test/mergetables/Tests/mergedb_drop.reqtests sql/test/mergetables/Tests/qlsmith-exist-lateral.reqtests sql/test/mergetables/Tests/sqlsmith-apply-outer-join-or.sql sql/test/mergetables/Tests/sqlsmith-apply-outer-join-or.stable.err sql/test/mergetables/Tests/sqlsmith-apply-outer-join-or.stable.out sql/test/mergetables/Tests/sqlsmith-exist-lateral.reqtests sql/test/mergetables/Tests/sqlsmith-exist-lateral.sql sql/test/mergetables/Tests/sqlsmith-exist-lateral.stable.err sql/test/mergetables/Tests/sqlsmith-exist-lateral.stable.out sql/test/mergetables/Tests/sqlsmith.Bug-6426.reqtests sql/test/mergetables/Tests/sqlsmith.Bug-6451.reqtests sql/test/mergetables/Tests/sqlsmith.Bug-6453.reqtests sql/test/mergetables/Tests/sqlsmith.Bug-6455.reqtests sql/test/mergetables/Tests/sqlsmith.Bug-6459.reqtests sql/test/mergetables/Tests/sqlsmith.Bug-6459.sql sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.err sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.out sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.out.int128 sql/test/mergetables/Tests/sqlsmith.Bug-6472.sql sql/test/mergetables/Tests/sqlsmith.Bug-6472.stable.err sql/test/mergetables/Tests/sqlsmith.Bug-6472.stable.out Removed Files: sql/benchmarks/tpch/fileleak/Tests/All sql/benchmarks/tpch/fileleak/Tests/check0.reqtests sql/benchmarks/tpch/fileleak/Tests/check0.sql sql/benchmarks/tpch/fileleak/Tests/check0.stable.err sql/benchmarks/tpch/fileleak/Tests/check0.stable.out sql/benchmarks/tpch/fileleak/Tests/check1.reqtests sql/benchmarks/tpch/fileleak/Tests/check1.sql sql/benchmarks/tpch/fileleak/Tests/check1.stable.err sql/benchmarks/tpch/fileleak/Tests/check1.stable.out sql/benchmarks/tpch/fileleak/Tests/create.sql.src sql/benchmarks/tpch/fileleak/Tests/create.stable.err sql/benchmarks/tpch/fileleak/Tests/create.stable.out sql/benchmarks/tpch/fileleak/Tests/delete_all.SQL.py sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.err sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out sql/benchmarks/tpch/fileleak/Tests/leaks.SQL.py
MonetDB: mosaic - Merge with default
Changeset: 0ae933dd61d5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0ae933dd61d5 Added Files: sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.sql sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.sql sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.err sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.out sql/test/BugTracker-2017/Tests/insert_into_multiple_subqueries.Bug-6448.sql sql/test/BugTracker-2017/Tests/insert_into_multiple_subqueries.Bug-6448.stable.err sql/test/BugTracker-2017/Tests/insert_into_multiple_subqueries.Bug-6448.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.sql sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.sql sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-cast-decimal.Bug-6445.sql sql/test/BugTracker-2017/Tests/sqlitelogictest-cast-decimal.Bug-6445.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-cast-decimal.Bug-6445.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-select-in.Bug-6433.sql sql/test/BugTracker-2017/Tests/sqlitelogictest-select-in.Bug-6433.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-select-in.Bug-6433.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-select-not-in.Bug-6435.sql sql/test/BugTracker-2017/Tests/sqlitelogictest-select-not-in.Bug-6435.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-select-not-in.Bug-6435.stable.out sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.stable.err sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.stable.out sql/test/BugTracker-2017/Tests/sqlsmith-semijoin-constant.bug-6417.sql sql/test/BugTracker-2017/Tests/sqlsmith-semijoin-constant.bug-6417.stable.err sql/test/BugTracker-2017/Tests/sqlsmith-semijoin-constant.bug-6417.stable.out sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6418.sql sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6418.stable.err sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6418.stable.out sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6423.sql sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6423.stable.err sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6423.stable.out sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6424.sql sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6424.stable.err sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6424.stable.out sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6425.sql sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6425.stable.err sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6425.stable.out sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6432.sql sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6432.stable.err sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6432.stable.out sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6449.sql sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6449.stable.err sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6449.stable.out sql/test/BugTracker-2017/Tests/table_returning_with.Bug-6444.sql sql/test/BugTracker-2017/Tests/table_returning_with.Bug-6444.stable.err sql/test/BugTracker-2017/Tests/table_returning_with.Bug-6444.stable.out sql/test/Tests/fsum.sql sql/test/Tests/fsum.stable.err sql/test/Tests/fsum.stable.out sql/test/Tests/fsum1.sql.src sql/test/Tests/fsum1.stable.err.src sql/test/Tests/fsum1.stable.out.src sql/test/mergetables/Tests/mergedb.Bug-6820.sql sql/test/mergetables/Tests/mergedb.Bug-6820.stable.err sql/test/mergetables/Tests/mergedb.Bug-6820.stable.out sql/test/mergetables/Tests/mergedb_create.sql sql/test/mergetables/Tests/mergedb_create.stable.err sql/test/mergetables/Tests/mergedb_create.stable.out sql/test/mergetables/Tests/mergedb_drop.sql sql/test/mergetables/Tests/mergedb_drop.stable.err sql/test/mergetables/Tests/mergedb_drop.stable.out sql/test/mergetables/Tests/sqlsmith.Bug-6426.sql
MonetDB: mosaic - Merge with default
Changeset: 8b334c0471e3 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8b334c0471e3 Added Files: monetdb5/modules/mal/Tests/remote13.malC sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_00.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_01.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_02.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_03.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_04.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_05.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_07.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_09.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_10.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_11.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_12.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_13.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_15.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_16.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_17.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_19.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_20.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_21.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_24.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_25.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_26.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_27.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_28.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_29.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_30.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_31.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_32.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_02.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_05.sql.src sql/jdbc/tests/Tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.SQL.bat sql/jdbc/tests/Tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.SQL.sh sql/jdbc/tests/Tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.stable.err sql/jdbc/tests/Tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.stable.out sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.stable.err sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.stable.out sql/test/BugTracker-2017/Tests/aggr_udf_with_more_than_2params.Bug-6385.sql sql/test/BugTracker-2017/Tests/aggr_udf_with_more_than_2params.Bug-6385.stable.err sql/test/BugTracker-2017/Tests/aggr_udf_with_more_than_2params.Bug-6385.stable.out sql/test/BugTracker-2017/Tests/case.Bug-6386.sql sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.err sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.out sql/test/BugTracker-2017/Tests/copy_into_crash.Bug-6404.sql sql/test/BugTracker-2017/Tests/copy_into_crash.Bug-6404.stable.err sql/test/BugTracker-2017/Tests/copy_into_crash.Bug-6404.stable.out sql/test/BugTracker-2017/Tests/corr_coersion.Bug-6287.sql sql/test/BugTracker-2017/Tests/corr_coersion.Bug-6287.stable.err sql/test/BugTracker-2017/Tests/corr_coersion.Bug-6287.stable.out sql/test/BugTracker-2017/Tests/exists.Bug-6392.sql sql/test/BugTracker-2017/Tests/exists.Bug-6392.stable.err sql/test/BugTracker-2017/Tests/exists.Bug-6392.stable.out sql/test/BugTracker-2017/Tests/null_matches_in_outer.Bug-6398.sql sql/test/BugTracker-2017/Tests/null_matches_in_outer.Bug-6398.stable.err sql/test/BugTracker-2017/Tests/null_matches_in_outer.Bug-6398.stable.out sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.sql sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.err sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct.Bug-6411.sql sql/test/BugTracker-2017/Tests/sqlitelogictest-having-with-in.Bug-6410.sql sql/test/BugTracker-2017/Tests/sqlitelogictest-having-with-in.Bug-6410.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-having-with-in.Bug-6410.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-having-with-not-in.Bug-6409.sql sql/test/BugTracker-2017/Tests/sqlitelogictest-having-with-not-in.Bug-6409.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-having-with-not-in.
MonetDB: mosaic - Merge with default
Changeset: 6c279ba4c4da for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c279ba4c4da Added Files: buildtools/selinux/monetdb.fc buildtools/selinux/monetdb.if buildtools/selinux/monetdb.te clients/Tests/mclient-uri.SQL.bat clients/Tests/mclient-uri.SQL.sh clients/Tests/mclient-uri.stable.err clients/Tests/mclient-uri.stable.out clients/Tests/mclient-uri.stable.out.Windows debian/libmonetdb-client9.install debian/libmonetdb15.install sql/backends/monet5/Tests/dbextra_lock_test.py sql/backends/monet5/Tests/dbextra_lock_test.stable.err sql/backends/monet5/Tests/dbextra_lock_test.stable.out sql/backends/monet5/Tests/pyapi34.sql sql/backends/monet5/Tests/pyapi34.stable.err sql/backends/monet5/Tests/pyapi34.stable.out sql/backends/monet5/Tests/pyloader08.sql sql/backends/monet5/Tests/pyloader08.stable.err sql/backends/monet5/Tests/pyloader08.stable.out sql/jdbc/tests/Tests/Bug_PrepStmtSetObject_CLOB_6349.SQL.bat sql/jdbc/tests/Tests/Bug_PrepStmtSetObject_CLOB_6349.SQL.sh sql/jdbc/tests/Tests/Bug_PrepStmtSetObject_CLOB_6349.stable.err sql/jdbc/tests/Tests/Bug_PrepStmtSetObject_CLOB_6349.stable.out sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err.Windows sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out.Windows sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD sql/test/BugTracker-2017/Tests/all_minus_count_star.Bug-6297.sql sql/test/BugTracker-2017/Tests/all_minus_count_star.Bug-6297.stable.err sql/test/BugTracker-2017/Tests/all_minus_count_star.Bug-6297.stable.out sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.sql sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.err sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out sql/test/BugTracker-2017/Tests/coalesc-limit.Bug-6316.sql sql/test/BugTracker-2017/Tests/coalesc-limit.Bug-6316.stable.err sql/test/BugTracker-2017/Tests/coalesc-limit.Bug-6316.stable.out sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.sql sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.err sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out.int128 sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.sql sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.err sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out.int128 sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.sql sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.stable.err sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.stable.out sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.sql sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.stable.err sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.stable.out sql/test/BugTracker-2017/Tests/create_table_as-missing_not_null.Bug-6329.sql sql/test/BugTracker-2017/Tests/create_table_as-missing_not_null.Bug-6329.stable.err sql/test/BugTracker-2017/Tests/create_table_as-missing_not_null.Bug-6329.stable.out sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.sql sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.stable.err sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.stable.out sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.sql sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.err sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.out sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.sql sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.stable.err sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.stable.out sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.sql sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.stable.err sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.stable.out sql/test/BugTracker-2017/Tests/extract_quarter_week_from_date.Bug-3831.sql sql/test/BugTracker-2017/Tests/extract_quarter_week_from_date.Bug-3831.stable.err sql/test/BugTracker-2017/Tests/extract_quarter_week_from_date.Bug-3831.s
MonetDB: mosaic - Merge with default
Changeset: 1771c88a9c74 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1771c88a9c74 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out gdk/gdk.h gdk/gdk_align.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_select.c gdk/gdk_utils.c geom/BugTracker/Tests/X_crash.SF-1971632.stable.err geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err geom/monetdb5/geom.c geom/monetdb5/geomBulk.c geom/sql/functions/Tests/ST_GeomFromText.stable.err geom/sql/functions/Tests/ST_LineFromText.stable.err geom/sql/functions/Tests/ST_MLineFromText.stable.err geom/sql/functions/Tests/ST_MPointFromText.stable.err geom/sql/functions/Tests/ST_MPolygonFromText.stable.err geom/sql/functions/Tests/ST_MakeBox2D.stable.err geom/sql/functions/Tests/ST_MakePoint.stable.err geom/sql/functions/Tests/ST_NumPoints.stable.err geom/sql/functions/Tests/ST_PointFromText.stable.err geom/sql/functions/Tests/ST_PolygonFromText.stable.err geom/sql/functions/Tests/XYZ.stable.err monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/rapi/rapi.c monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_atom.c monetdb5/mal/mal_authorize.c monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_exception.c monetdb5/mal/mal_factory.c monetdb5/mal/mal_import.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_namespace.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_session.c monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mcurl.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/str.c monetdb5/modules/atoms/streams.c monetdb5/modules/atoms/url.c monetdb5/modules/atoms/uuid.c monetdb5/modules/atoms/xml.c monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/batstr.c monetdb5/modules/kernel/status.c monetdb5/modules/mal/Tests/orderidx00.malC monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/calc.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/groupby.c monetdb5/modules/mal/inspect.c monetdb5/modules/mal/iterator.c monetdb5/modules/mal/json_util.c monetdb5/modules/mal/language.c monetdb5/modules/mal/mal_init.mal monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/manual.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/mkey.c monetdb5/modules/mal/oltp.c monetdb5/modules/mal/orderidx.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/projectionpath.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tokenizer.c monetdb5/modules/mal/txtsim.c monetdb5/modules/mosaic/mosaic.mal monetdb5/optimizer/opt_aliases.c monetdb5/optimizer/opt_coercion.c monetdb5/optimizer/opt_commonTerms.c monetdb5/optimizer/opt_constants.c monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_evaluate.c monetdb5/optimizer/opt_garbageCollector.c monetdb5/optimizer/opt_generator.c monetdb5/optimizer/opt_jit.c monetdb5/optimizer/opt_json.c monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_matpack.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_mosaic.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_oltp.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_projectionpath.c monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_querylog.c monetdb5/optimizer/opt_remap.c monetdb5/optimizer/opt_remoteQueries.c monetdb5/optimizer/opt_reorder.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_volcano.c monetdb5/optimizer/opt_wlc.c monetdb5/optimizer/opt_wrapper.c
MonetDB: mosaic - Merge with default
Changeset: 4af795090aae for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4af795090aae Added Files: buildtools/selinux/monetdb.fc buildtools/selinux/monetdb.if buildtools/selinux/monetdb.te debian/libmonetdb-client9.install debian/libmonetdb15.install sql/backends/monet5/Tests/pyapi34.sql sql/backends/monet5/Tests/pyapi34.stable.err sql/backends/monet5/Tests/pyapi34.stable.out sql/backends/monet5/Tests/pyloader08.sql sql/backends/monet5/Tests/pyloader08.stable.err sql/backends/monet5/Tests/pyloader08.stable.out sql/jdbc/tests/Tests/Bug_PrepStmtSetObject_CLOB_6349.SQL.bat sql/jdbc/tests/Tests/Bug_PrepStmtSetObject_CLOB_6349.SQL.sh sql/jdbc/tests/Tests/Bug_PrepStmtSetObject_CLOB_6349.stable.err sql/jdbc/tests/Tests/Bug_PrepStmtSetObject_CLOB_6349.stable.out sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err.Windows sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out.Windows sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.sql sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.err sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out sql/test/BugTracker-2017/Tests/coalesc-limit.Bug-6316.stable.err sql/test/BugTracker-2017/Tests/coalesc-limit.Bug-6316.stable.out sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.sql sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.err sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out.int128 sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.sql sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.err sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out.int128 sql/test/BugTracker-2017/Tests/create_table_as-missing_not_null.Bug-6329.sql sql/test/BugTracker-2017/Tests/create_table_as-missing_not_null.Bug-6329.stable.err sql/test/BugTracker-2017/Tests/create_table_as-missing_not_null.Bug-6329.stable.out sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.sql sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.stable.err sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.stable.out sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.sql sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.err sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.out sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.stable.err sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.stable.out sql/test/BugTracker-2017/Tests/extract_quarter_week_from_date.Bug-3831.sql sql/test/BugTracker-2017/Tests/extract_quarter_week_from_date.Bug-3831.stable.err sql/test/BugTracker-2017/Tests/extract_quarter_week_from_date.Bug-3831.stable.out sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.sql sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.sql sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.stable.err sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.stable.out sql/test/BugTracker-2017/Tests/lateral.Bug-6310.stable.err sql/test/BugTracker-2017/Tests/lateral.Bug-6310.stable.out sql/test/BugTracker-2017/Tests/lateral02.Bug-6314.stable.err sql/test/BugTracker-2017/Tests/lateral02.Bug-6314.stable.out sql/test/BugTracker-2017/Tests/limit.bug-6322.sql sql/test/BugTracker-2017/Tests/limit_clause.Bug-6312.stable.err sql/test/BugTracker-2017/Tests/limit_clause.Bug-6312.stable.out sql/test/BugTracker-2017/Tests/multiplevalues.Bug-6336.sql sql/test/BugTracker-2017/Tests/name-interference.Bug-6348.sql sql/test/BugTracker-2017/Tests/name-interference.Bug-6348.stable.err sql/test/BugTracker-2017/Tests/name-interference.Bug-6348.stable.out sql/test/BugTracker-2017/Tests/parsererror.Bug-6381.sql sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.sql sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.stable.err sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.stable.out sql/test/BugTracker-2017/Tests/simplify_math.Bug-6324.sql sql/test/BugTracker-2017/Tests/simplify_math.Bug-6324.stable.err sql/test/BugTracker-2017/Tests/simplify_math.Bug-6324.stable.out sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.sql sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.err sql/test/BugTracker-20
MonetDB: mosaic - Merge with default (old)
Changeset: bbb3191c92af for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bbb3191c92af Added Files: clients/Tests/mclient-uri.SQL.bat clients/Tests/mclient-uri.SQL.sh clients/Tests/mclient-uri.stable.err clients/Tests/mclient-uri.stable.out clients/Tests/mclient-uri.stable.out.Windows sql/backends/monet5/Tests/dbextra_lock_test.py sql/backends/monet5/Tests/dbextra_lock_test.stable.err sql/backends/monet5/Tests/dbextra_lock_test.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD sql/test/BugTracker-2017/Tests/all_minus_count_star.Bug-6297.sql sql/test/BugTracker-2017/Tests/all_minus_count_star.Bug-6297.stable.err sql/test/BugTracker-2017/Tests/all_minus_count_star.Bug-6297.stable.out sql/test/BugTracker-2017/Tests/coalesc-limit.Bug-6316.sql sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.sql sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.stable.err sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.stable.out sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.sql sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.stable.err sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.stable.out sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.sql sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.stable.err sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.stable.out sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.sql sql/test/BugTracker-2017/Tests/lateral.Bug-6310.sql sql/test/BugTracker-2017/Tests/lateral02.Bug-6314.sql sql/test/BugTracker-2017/Tests/limit_clause.Bug-6312.sql sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.stable.err sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.stable.out sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.sql sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.stable.err sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.stable.out sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.sql sql/test/Tests/copy-into-fwf.sql.in sql/test/Tests/copy-into-fwf.stable.err sql/test/Tests/copy-into-fwf.stable.out sql/test/Tests/mtcars Modified Files: MonetDB.spec NT/mksqlwxs.py NT/monetdb_config.h.in README.rst bootstrap buildtools/autogen/setup.py buildtools/conf/website.html clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/dump.c clients/mapiclient/mclient.1 clients/mapiclient/mclient.c clients/mapilib/mapi.c common/stream/stream.c common/stream/stream.h common/utils/msabaoth.c common/utils/mutils.h debian/control gdk/gdk_atoms.c gdk/gdk_group.c gdk/gdk_logger.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_utils.c monetdb5/mal/mal_profiler.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/str.c monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/manual.c monetdb5/modules/mal/oltp.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/querylog.h sql/backends/monet5/UDF/cudf/README sql/backends/monet5/generator/generator.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_rank.mal sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_upgrades.c sql/common/sql_types.c sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.stable.out sql/scripts/25_debug.sql sql/scripts/51_sys_schema_extension.sql sql/server/rel_exp.c sql/server/rel_select.c sql/test/BugDay_2005-12-19_2.9.3/Tests/subselect_cardinality.SF-1240701.1242164.stable.err sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err sql/test/BugTracker-2016/Tests/storagemodel.sql sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows sql/test/BugTracker-2017/Tests/All sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out sql/test/BugTracker-2017/Tests/n
MonetDB: mosaic - Merge with default
Changeset: 237391267472 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=237391267472 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/dotmonetdb.c clients/mapiclient/mclient.c clients/odbc/samples/arraytest.c clients/odbc/samples/odbcsample1.c clients/odbc/samples/testgetinfo.c common/stream/stream.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_bbp.c gdk/gdk_heap.c gdk/gdk_logger.c gdk/gdk_search.c gdk/gdk_storage.c geom/monetdb5/geom.c geom/monetdb5/geom_upgrade.c monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/extras/rapi/rapi.c monetdb5/mal/mal_atom.c monetdb5/mal/mal_builder.c monetdb5/mal/mal_client.c monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_exception.c monetdb5/mal/mal_function.c monetdb5/mal/mal_import.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_linker.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resolve.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_session.c monetdb5/mal/mal_type.c monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/blob.h monetdb5/modules/atoms/color.c monetdb5/modules/atoms/identifier.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/str.c monetdb5/modules/atoms/streams.c monetdb5/modules/atoms/url.c monetdb5/modules/atoms/uuid.c monetdb5/modules/atoms/xml.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tablet.h monetdb5/modules/mal/txtsim.c monetdb5/modules/mal/wlc.c monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_evaluate.c monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_reorder.c monetdb5/optimizer/opt_support.c monetdb5/scheduler/run_adder.c sql/backends/monet5/UDF/pyapi/convert_loops.h sql/backends/monet5/UDF/pyapi/unicode.c sql/backends/monet5/generator/generator.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/backends/monet5/vaults/bam/bam_export.c sql/backends/monet5/vaults/bam/bam_globals.h sql/backends/monet5/vaults/bam/bam_wrapper.c sql/backends/monet5/vaults/shp/shp.c sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out sql/benchmarks/tpch/Tests/01-22.stable.out sql/common/sql_mem.c sql/common/sql_types.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_planner.c sql/server/rel_psm.c sql/server/rel_rel.c sql/server/rel_select.c sql/server/rel_updates.c sql/storage/store.c sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.out sql/test/BugTracker-2017/Tests/All sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out sql/test/BugTracker-2017/Tests/wrong_aggregation_count.Bug-6257.stable.out sql/test/Dump/Tests/dump.stable.out sql/test/Tests/setoptimizer.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
MonetDB: mosaic - Merge with default
Changeset: c01fc798019d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c01fc798019d Added Files: ChangeLog.Jul2017 NT/mkgeomwxs.py NT/mkodbcwxs.py NT/mksqlwxs.py buildtools/ChangeLog.Jul2017 clients/ChangeLog.Jul2017 clients/mapilib/ChangeLog.Jul2017 common/stream/ChangeLog.Jul2017 gdk/ChangeLog.Jul2017 geom/ChangeLog.Jul2017 monetdb5/ChangeLog.Jul2017 monetdb5/modules/mal/wlc.c monetdb5/modules/mal/wlc.h monetdb5/modules/mal/wlc.mal monetdb5/optimizer/opt_wlc.c monetdb5/optimizer/opt_wlc.h sql/ChangeLog.Jul2017 sql/backends/monet5/UDF/pyapi3/50_pyapi3.mal sql/backends/monet5/UDF/pyapi3/Makefile.ag sql/backends/monet5/UDF/pyapi3/Tests/All sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_00.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_00.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_00.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_01.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_01.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_01.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_02.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_02.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_02.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_03.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_03.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_03.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_04.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_04.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_04.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_05.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_05.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_05.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_07.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_07.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_07.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_09.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_09.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_09.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_10.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_10.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_10.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_11.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_11.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_11.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_12.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_12.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_12.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_13.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_13.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_13.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_15.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_16.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_16.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_16.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_17.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_17.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_17.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_19.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_19.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_19.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_20.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_20.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_20.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_21.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_21.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_21.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_24.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_24.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_24.stable.out sql/backends/monet5/UDF/p
MonetDB: mosaic - merge with default
Changeset: 263074fe03b9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=263074fe03b9 Added Files: sql/backends/monet5/Tests/pyloader06.stable.out.Windows sql/backends/monet5/Tests/pyloader07.stable.out.Windows sql/jdbc/tests/Tests/BugResultSetMetaData_Bug_6183.SQL.bat sql/jdbc/tests/Tests/BugResultSetMetaData_Bug_6183.SQL.sh sql/jdbc/tests/Tests/BugResultSetMetaData_Bug_6183.stable.err sql/jdbc/tests/Tests/BugResultSetMetaData_Bug_6183.stable.out sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.sql sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.stable.err sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.stable.out sql/test/BugTracker-2017/Tests/cast_boolean_to_string.Bug-6110.sql sql/test/BugTracker-2017/Tests/cast_boolean_to_string.Bug-6110.stable.err sql/test/BugTracker-2017/Tests/cast_boolean_to_string.Bug-6110.stable.out sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.sql sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.stable.err sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.stable.out 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.err sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.sql sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.err sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out sql/test/BugTracker-2017/Tests/insert_self_ref_FK.Bug-6131.sql sql/test/BugTracker-2017/Tests/insert_self_ref_FK.Bug-6131.stable.err sql/test/BugTracker-2017/Tests/insert_self_ref_FK.Bug-6131.stable.out sql/test/BugTracker-2017/Tests/modulo.Bug-6225.sql sql/test/BugTracker-2017/Tests/modulo.Bug-6225.stable.err sql/test/BugTracker-2017/Tests/modulo.Bug-6225.stable.out sql/test/BugTracker-2017/Tests/one-plus-nil.Bug-6243.sql sql/test/BugTracker-2017/Tests/one-plus-nil.Bug-6243.stable.err sql/test/BugTracker-2017/Tests/one-plus-nil.Bug-6243.stable.out sql/test/BugTracker-2017/Tests/unknown_col_in_order_by.Bug-3535.sql sql/test/BugTracker-2017/Tests/unknown_col_in_order_by.Bug-3535.stable.err sql/test/BugTracker-2017/Tests/unknown_col_in_order_by.Bug-3535.stable.out sql/test/BugTracker-2017/Tests/with-alias-bug.6246.sql sql/test/BugTracker-2017/Tests/with-alias-bug.6246.stable.err sql/test/BugTracker-2017/Tests/with-alias-bug.6246.stable.out sql/test/orderidx/Tests/oidx_all_types.sql sql/test/orderidx/Tests/oidx_all_types.stable.err sql/test/orderidx/Tests/oidx_all_types.stable.out sql/test/orderidx/Tests/oidx_hge_type.sql sql/test/orderidx/Tests/oidx_hge_type.stable.err sql/test/orderidx/Tests/oidx_hge_type.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py.src sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py.src sql/test/testdb-upgrade-chain/Tests/dump.SQL.py.src sql/test/testdb-upgrade-chain/Tests/upgrade.SQL.py.src sql/test/testdb-upgrade-hge/Tests/dump.SQL.py.src sql/test/testdb-upgrade-hge/Tests/upgrade.SQL.py.src sql/test/testdb-upgrade/Tests/dump.SQL.py.src Removed Files: monetdb5/optimizer/opt_statistics.c monetdb5/optimizer/opt_statistics.h sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py sql/test/testdb-upgrade-chain/Tests/dump.SQL.py sql/test/testdb-upgrade-chain/Tests/upgrade.SQL.py sql/test/testdb-upgrade-hge/Tests/dump.SQL.py sql/test/testdb-upgrade-hge/Tests/upgrade.SQL.py sql/test/testdb-upgrade/Tests/dump.SQL.py 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/R/Tests/All clients/R/Tests/copy_into_fwf.stable.out clients/R/Tests/dbapply.stable.out clients/R/Tests/dbi.R clients/R/Tests/dbi.stable.out clients/R/Tests/deps-test.R clients/R/Tests/dplyr-flights.R clients/R/Tests/dplyr-flights.stable.out clients/R/Tests/dplyr.R clients/R/Tests/dplyr.stable.err clients/R/Tests/dplyr.sta
MonetDB: mosaic - merge with default
Changeset: 046549891b58 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=046549891b58 Added Files: monetdb5/modules/atoms/Tests/strappend.malC monetdb5/modules/atoms/Tests/strappend.stable.err monetdb5/modules/atoms/Tests/strappend.stable.out monetdb5/optimizer/Tests/tst4006.malC monetdb5/optimizer/Tests/tst4006.stable.err monetdb5/optimizer/Tests/tst4006.stable.out sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.sql sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.err sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.out 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/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog gdk/ChangeLog.Dec2016 gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_join.c gdk/libbat.rc geom/sql/functions/Tests/ST_NumInteriorRings.stable.out monetdb5/mal/Tests/performanceTests/performanceLog monetdb5/mal/mal.h monetdb5/mal/mal_client.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_function.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/modules/atoms/Tests/All monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/manifold.c monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/GCexample01.stable.out monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_garbageCollector.c monetdb5/optimizer/opt_pipes.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql_statistics.c sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out sql/server/rel_rel.c sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out sql/test/BugTracker-2017/Tests/All sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/remote/Tests/partition_elim.stable.out vertoo.data Branch: mosaic Log Message: merge with default diffs (truncated from 1976 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -651,3 +651,6 @@ bf4b58d202645774b75c7f508c84b30e3be78a49 bf4b58d202645774b75c7f508c84b30e3be78a49 Dec2016_SP1_release 3968ed7fb6dab04a2530c6c3e1a5ffd6d649298b Dec2016_7 3968ed7fb6dab04a2530c6c3e1a5ffd6d649298b Dec2016_SP2_release +615229dc6f3c7dc89bbd9cc5923ad307b4c93cb1 Dec2016_9 +3968ed7fb6dab04a2530c6c3e1a5ffd6d649298b Dec2016_SP2_release +615229dc6f3c7dc89bbd9cc5923ad307b4c93cb1 Dec2016_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -944,6 +944,13 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Mon Feb 27 2017 Panagiotis Koutsourakis - 11.25.9-20170227 +- Rebuilt. +- BZ#6217: Segfault in rel_optimizer (sqlsmith) +- BZ#6218: grouped quantiles with all null group causes following groups + to return null +- BZ#6224: mal_parser: cannot refer to types containing an underscore + * Thu Feb 16 2017 Panagiotis Koutsourakis - 11.25.7-20170216 - Rebuilt. - BZ#4034: argnames array in rapi.c has fixed length (that was too short) diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -128,6 +128,7 @@ AS_CASE([$CC], [10.*], [CC="$CC -no-gcc"], [11.*], [CC="$CC -no-gcc"], [15.*], [CC="$CC -no-gcc"], + [17.*], [CC="$CC -no-gcc"], [AC_MSG_WARN([icc ($CC) $icc_ver not handled, yet])])]) AS_IF([test -f "$srcdir"/vertoo.data], @@ -683,6 +684,7 @@ AS_VAR_IF([enable_strict], [yes], [ [10.*], [], [11.*], [], [15.*], [], + [17.*], [], [CFLAGS="$CFLAGS -ansi"]) # Be picky; "-Werror" seems to be too rigid for autoconf... CFLAGS="$CFLAGS -Wall -w2 -Wcheck" @@ -704,7 +706,8 @@ AS_VAR_IF([enable_strict], [yes], [ # constants like short s = 1234, which is too much AS_CASE([$icc_ver], [11.*], [X_CFLAGS="$X_CFLAGS,2259"], - [15.*], [X_CFLAGS="$X_CFLAGS,2259"]) +
MonetDB: mosaic - merge with default
Changeset: 5d1ca685c286 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d1ca685c286 Added Files: monetdb5/mal/Tests/malids.malC monetdb5/mal/Tests/malids.stable.err monetdb5/mal/Tests/malids.stable.out monetdb5/modules/kernel/Tests/select.malC monetdb5/modules/kernel/Tests/select.stable.err monetdb5/modules/kernel/Tests/select.stable.out sql/test/BugTracker-2017/Tests/real-power.Bug-6228.sql sql/test/BugTracker-2017/Tests/real-power.Bug-6228.stable.err sql/test/BugTracker-2017/Tests/real-power.Bug-6228.stable.out Removed Files: monetdb5/mal/Tests/tst273.stable.err monetdb5/mal/Tests/tst273.stable.out monetdb5/optimizer/Tests/flowgraph.malC monetdb5/optimizer/Tests/flowgraph.stable.err monetdb5/optimizer/Tests/flowgraph.stable.out Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out gdk/gdk_logger.c gdk/gdk_project.c gdk/gdk_select.c geom/monetdb5/geom.c geom/monetdb5/geomBulk.c geom/monetdb5/geom_upgrade.c monetdb5/mal/Tests/All monetdb5/mal/Tests/run monetdb5/mal/mal.h monetdb5/mal/mal_authorize.c monetdb5/mal/mal_builder.c monetdb5/mal/mal_builder.h monetdb5/mal/mal_client.c monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_function.c monetdb5/mal/mal_function.h monetdb5/mal/mal_import.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_parser.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_session.c monetdb5/modules/kernel/Tests/All monetdb5/modules/kernel/aggr.c monetdb5/modules/mal/Tests/orderidx00.malC monetdb5/modules/mal/Tests/orderidx01.malC monetdb5/modules/mal/Tests/orderidx02.malC monetdb5/modules/mal/Tests/orderidx04.malC monetdb5/modules/mal/language.mal monetdb5/modules/mal/manifold.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/mdb.h monetdb5/modules/mal/mdb.mal monetdb5/modules/mal/oltp.mal monetdb5/modules/mal/orderidx.c monetdb5/modules/mal/remote.mal monetdb5/optimizer/Tests/All monetdb5/optimizer/opt_commonTerms.c monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_garbageCollector.c monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_profiler.c monetdb5/optimizer/opt_reorder.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_support.h monetdb5/optimizer/opt_wrapper.c monetdb5/optimizer/optimizer.mal monetdb5/scheduler/run_adder.c monetdb5/tools/Tests/mserver5--help.stable.err monetdb5/tools/Tests/mserver5--help.stable.err.Windows sql/backends/monet5/Tests/All sql/backends/monet5/Tests/pyloader06.stable.out sql/backends/monet5/Tests/pyloader07.stable.out sql/backends/monet5/UDF/pyapi/convert_loops.h sql/backends/monet5/UDF/pyapi/emit.c sql/backends/monet5/generator/generator.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sqlcatalog.mal sql/backends/monet5/vaults/netcdf/netcdf.c sql/common/sql_hash.c sql/common/sql_list.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_rel.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_utils.c sql/storage/bat/res_table.c sql/storage/sql_catalog.c sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out sql/test/BugTracker-2017/Tests/All sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit sql/test/emptydb-upgrade/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.32bit tools/mserver/mserver5.c Branch: m
MonetDB: mosaic - Merge with default
Changeset: 113912afb502 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=113912afb502 Added Files: sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.sql sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.err sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.out sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6217.sql sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6217.stable.err sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6217.stable.out Removed Files: monetdb5/extras/sphinx/30_sphinx.mal monetdb5/extras/sphinx/Makefile.ag monetdb5/extras/sphinx/sphinx.c monetdb5/extras/sphinx/sphinx.h monetdb5/extras/sphinx/sphinx.mal Modified Files: MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 configure.ag debian/rules monetdb5/ChangeLog monetdb5/extras/Makefile.ag sql/test/BugTracker-2017/Tests/All testing/Mfilter.py testing/Mtest.py.in Branch: mosaic Log Message: Merge with default diffs (truncated from 619 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -159,7 +159,6 @@ BuildRequires: libatomic_ops-devel BuildRequires: libcurl-devel BuildRequires: xz-devel # BuildRequires: libmicrohttpd-devel -# BuildRequires: libsphinxclient-devel BuildRequires: libuuid-devel BuildRequires: libxml2-devel BuildRequires: openssl-devel @@ -918,7 +917,6 @@ developer, but if you do want to test, t --with-python3=no \ --with-readline=yes \ --with-samtools=%{?with_samtools:yes}%{!?with_samtools:no} \ - --with-sphinxclient=no \ --with-unixodbc=yes \ --with-uuid=yes \ --with-valgrind=no \ 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 @@ -493,9 +493,6 @@ /* Define to 1 if the system has the type `socklen_t'. */ #define HAVE_SOCKLEN_T 1 -/* Define if you have the sphinxclient library */ -/* #undef HAVE_SPHINXCLIENT */ - /* Define if you have the SQLGetPrivateProfileString function */ #define HAVE_SQLGETPRIVATEPROFILESTRING 1 diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -396,11 +396,6 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) HAVE_SAMTOOLS_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF -!IFDEF HAVE_SPHINXCLIENT - $(ECHO) HAVE_SPHINXCLIENT_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" -!ELSE - $(ECHO) HAVE_SPHINXCLIENT_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF !IFDEF HAVE_SQL $(ECHO) HAVE_SQL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,3 +1,3 @@ exports -HAVE_FITS&HAVE_GEOM&HAVE_LIBPY&HAVE_LIBR&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&HAVE_SPHINXCLIENT?MAL-signatures +HAVE_FITS&HAVE_GEOM&HAVE_LIBPY&HAVE_LIBR&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP?MAL-signatures MERCURIAL?malcheck diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -1812,38 +1812,6 @@ AS_VAR_IF([have_valgrind], [no], [], [ [AC_DEFINE([HAVE_VALGRIND], 1, [Define if you have valgrind installed and want to use it])], [AS_VAR_IF([have_valgrind], [yes], [AC_MSG_ERROR([no valgrind support found])])])]) -# check for sphinxclient -org_have_sphinxclient="auto" -have_sphinxclient=$org_have_sphinxclient -AC_ARG_WITH([sphinxclient], -[AS_HELP_STRING([--with-sphinxclient=DIR], [sphinxclient library is installed in DIR])], -[have_sphinxclient="$withval"]) -AS_VAR_IF([have_sphinxclient], [no], [], [ - AS_CASE([$have_sphinxclient], - [auto|yes], [], - [ - SPHINXCLIENT_CFLAGS="-I$have_sphinxclient/include" - SPHINXCLIENT_LIBS="-L$have_sphinxclient/lib"]) - - save_CPPFLAGS="$CPPFLAGS" - save_LDFLAGS="$LDFLAGS" - CPPFLAGS="$CPPFLAGS $SPHINXCLIENT_CFLAGS" - LDFLAGS="$LDFLAGS $SPHINXCLIENT_LIBS" - AC_CHECK_HEADER([sphinxclient.h], - AC_CHECK_LIB([sphinxclient], [sphinx_create], - [AC_DEFINE([HAVE_SPHINXCLIENT], 1, [Define if you have the sphinxclient library])] - [have_sphinxclient=yes] - [SPHINXCLIENT_LIBS="$SPHINXCLIENT_LIBS -lsphinxclient"], - [AS_VAR_IF([have_sphinxclient], [auto], [], [AC_MSG_ERROR([-lsphinxclient library not found])]) - have_sphinxclient=no; why_have_sphinxclient="(sphinxclient library not found)" ]), - [AS_VAR_IF([have_sphinxclient], [auto], [], [AC_MSG_ERROR([sphinxclient.h header not found])]) - have_sphinxclient=no; why_have_sphinxclient="(sphinx
MonetDB: mosaic - Merge with default
Changeset: c4a439e618ce for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c4a439e618ce Added Files: sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.sql sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.stable.err sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.stable.out sql/test/BugTracker-2017/Tests/dce_bug-6177.sql sql/test/BugTracker-2017/Tests/dce_bug-6177.stable.err sql/test/BugTracker-2017/Tests/dce_bug-6177.stable.out sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out.int128 sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.sql sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.err sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.out sql/test/BugTracker-2017/Tests/nested_with.Bug-6187.sql sql/test/BugTracker-2017/Tests/nested_with.Bug-6187.stable.err sql/test/BugTracker-2017/Tests/nested_with.Bug-6187.stable.out sql/test/BugTracker-2017/Tests/null-quantile.Bug-6218.sql sql/test/BugTracker-2017/Tests/null-quantile.Bug-6218.stable.err sql/test/BugTracker-2017/Tests/null-quantile.Bug-6218.stable.out sql/test/BugTracker-2017/Tests/prepare.Bug-6133.sql sql/test/BugTracker-2017/Tests/prepare.Bug-6133.stable.err sql/test/BugTracker-2017/Tests/prepare.Bug-6133.stable.out sql/test/BugTracker-2017/Tests/sqlsmith01.sql sql/test/BugTracker-2017/Tests/sqlsmith01.stable.err sql/test/BugTracker-2017/Tests/sqlsmith01.stable.out sql/test/BugTracker-2017/Tests/sqlsmith02.sql sql/test/BugTracker-2017/Tests/sqlsmith02.stable.err sql/test/BugTracker-2017/Tests/sqlsmith02.stable.out sql/test/BugTracker-2017/Tests/sqlsmith03.sql sql/test/BugTracker-2017/Tests/sqlsmith03.stable.err sql/test/BugTracker-2017/Tests/sqlsmith03.stable.out sql/test/BugTracker-2017/Tests/sqlsmith04.sql sql/test/BugTracker-2017/Tests/sqlsmith04.stable.err sql/test/BugTracker-2017/Tests/sqlsmith04.stable.out sql/test/emptydb/Tests/check.SQL.py sql/test/mergetables/Tests/addtable.sql sql/test/mergetables/Tests/addtable.stable.err sql/test/mergetables/Tests/addtable.stable.out Removed Files: clients/Tests/SQL-dump.SQL.py clients/Tests/SQL-dump.stable.err clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 debian/libmonetdb5-server-gsl.install sql/backends/monet5/gsl/46_gsl.sql sql/backends/monet5/gsl/73_gsl.mal sql/backends/monet5/gsl/Makefile.ag sql/backends/monet5/gsl/Tests/All sql/backends/monet5/gsl/Tests/gsl00.malC sql/backends/monet5/gsl/Tests/gsl00.stable.err sql/backends/monet5/gsl/Tests/gsl00.stable.out sql/backends/monet5/gsl/Tests/gsl01.sql sql/backends/monet5/gsl/Tests/gsl01.stable.err sql/backends/monet5/gsl/Tests/gsl01.stable.out sql/backends/monet5/gsl/gsl.c sql/backends/monet5/gsl/gsl.mal sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.err.single sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out.single sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out.single sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit sql/test/BugTracker-2016/Tests/storagemodel.stable.out.int128 sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/emptydb/Tests/check.SQL.py.src 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/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog debian/control debian/rules gdk/ChangeLog gdk/Makefile.ag gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_imprints.c gdk/gdk_interprocess.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_orderidx.c gdk/gdk_private.h
MonetDB: mosaic - Merge with default
Changeset: 48eeabba11cc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=48eeabba11cc Added Files: monetdb5/extras/rapi/Tests/rapi02.stable.out.int128 sql/backends/monet5/Tests/int_notation_1e5.stable.out.int128 sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_huge.stable.out.int128 sql/jdbc/tests/Tests/Test_Int128.stable.out.int128 sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.out.int128 sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out.int128 sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out.int128 sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.sql sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.stable.err sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.stable.out sql/test/mapi/Tests/mal_int128.stable.out.int128 sql/test/mapi/Tests/perl_dec38.stable.out.int128 sql/test/mapi/Tests/perl_int128.stable.out.int128 sql/test/mapi/Tests/php_dec38.stable.out.int128 sql/test/mapi/Tests/php_int128.stable.out.int128 sql/test/mapi/Tests/python2_dec38.stable.out.int128 sql/test/mapi/Tests/python2_int128.stable.out.int128 sql/test/mapi/Tests/python3_dec38.stable.out.int128 sql/test/mapi/Tests/python3_int128.stable.out.int128 sql/test/mapi/Tests/sql_dec38.stable.out.int128 sql/test/mapi/Tests/sql_int128.stable.out.int128 sql/test/pg_regress/Tests/numeric.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/package.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/unpackage.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb/Tests/testdb-package-hge.stable.out.int128 Removed Files: gdk/bat.feps gdk/bat.png gdk/bat1.feps gdk/bat1.png gdk/bat2.feps gdk/bat2.png monetdb5/extras/rapi/Tests/rapi02.stable.out sql/backends/monet5/Tests/int_notation_1e5.stable.out sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_huge.stable.out sql/jdbc/tests/Tests/Test_Int128.stable.out sql/storage/store_connections.c sql/storage/store_connections.h sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.out sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out sql/test/Connections/Tests/All sql/test/Connections/Tests/connections.py sql/test/Connections/Tests/connections.stable.err sql/test/Connections/Tests/connections.stable.err.SunOS sql/test/Connections/Tests/connections.stable.err.Windows sql/test/Connections/Tests/connections.stable.out sql/test/Connections/connections_default_values.sql sql/test/Connections/connections_semantic.sql sql/test/Connections/connections_syntax.sql sql/test/mapi/Tests/mal_int128.stable.out sql/test/mapi/Tests/perl_dec38.stable.out sql/test/mapi/Tests/perl_int128.stable.out sql/test/mapi/Tests/php_dec38.stable.out sql/test/mapi/Tests/php_int128.stable.out sql/test/mapi/Tests/python2_dec38.stable.out sql/test/mapi/Tests/python2_int128.stable.out sql/test/mapi/Tests/python3_dec38.stable.out sql/test/mapi/Tests/python3_int128.stable.out sql/test/mapi/Tests/sql_dec38.stable.out sql/test/mapi/Tests/sql_int128.stable.out sql/test/pg_regress/Tests/numeric.stable.out sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out sql/test/testdb-upgrade-chain-hge/Tests/package.stable.out sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.out sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out sql/test/testdb-upgrade-hge/Tests/dump.stable.out sql/test/testdb-upgrade-hge/Tests/unpackage.stable.out sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out sql/test/testdb/Tests/testdb-package-hge.stable.out Modified Files: clients/Tests/SQL-dump.SQL.py clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out gdk/gdk_interprocess.h gdk/gdk_join.c monetdb5/extras/rapi/rapi.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/mal_mapi.h monetdb5/modules/mal/sysmon.c sql/ChangeLog sql/backends/monet5/sql_round_impl.h sql/benchmarks/ssbm/Tests/01-13.stable.out sql/benchmarks
MonetDB: mosaic - Merge with default
Changeset: be436a3a734c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be436a3a734c Added Files: sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.sql sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.stable.err sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.stable.out sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.sql sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.err sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.sql sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.err sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.out Modified Files: clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_bbp.c gdk/gdk_heap.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_upgrades.c sql/benchmarks/ATIS/Tests/select_group.stable.out sql/benchmarks/ATIS/Tests/select_group.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/01.stable.out sql/benchmarks/tpch/LOCKED/Tests/01.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/03.stable.out sql/benchmarks/tpch/LOCKED/Tests/03.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/04.stable.out sql/benchmarks/tpch/LOCKED/Tests/05.stable.out sql/benchmarks/tpch/LOCKED/Tests/05.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/06.stable.out sql/benchmarks/tpch/LOCKED/Tests/06.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/07.stable.out sql/benchmarks/tpch/LOCKED/Tests/07.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/08.stable.out sql/benchmarks/tpch/LOCKED/Tests/08.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/09.stable.out sql/benchmarks/tpch/LOCKED/Tests/09.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/10.stable.out sql/benchmarks/tpch/LOCKED/Tests/10.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/11.stable.out sql/benchmarks/tpch/LOCKED/Tests/11.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/12.stable.out sql/benchmarks/tpch/LOCKED/Tests/12.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/13.stable.out sql/benchmarks/tpch/LOCKED/Tests/14.stable.out sql/benchmarks/tpch/LOCKED/Tests/14.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/15.stable.out sql/benchmarks/tpch/LOCKED/Tests/15.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/16.stable.out sql/benchmarks/tpch/LOCKED/Tests/17.stable.out sql/benchmarks/tpch/LOCKED/Tests/17.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/18.stable.out sql/benchmarks/tpch/LOCKED/Tests/18.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/19.stable.out sql/benchmarks/tpch/LOCKED/Tests/19.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/21.stable.out sql/benchmarks/tpch/LOCKED/Tests/21.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/22.stable.out sql/benchmarks/tpch/LOCKED/Tests/22.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/check1.stable.out sql/benchmarks/tpch/LOCKED/Tests/check2.stable.out sql/benchmarks/tpch/LOCKED/Tests/load.stable.out sql/benchmarks/tpch/Tests/01-22.stable.out sql/benchmarks/tpch/Tests/01-22.stable.out.int128 sql/benchmarks/tpch/Tests/01.stable.out sql/benchmarks/tpch/Tests/01.stable.out.int128 sql/benchmarks/tpch/Tests/03.stable.out sql/benchmarks/tpch/Tests/03.stable.out.int128 sql/benchmarks/tpch/Tests/05.stable.out sql/benchmarks/tpch/Tests/05.stable.out.int128 sql/benchmarks/tpch/Tests/06.stable.out sql/benchmarks/tpch/Tests/06.stable.out.int128 sql/benchmarks/tpch/Tests/07.stable.out sql/benchmarks/tpch/Tests/07.stable.out.int128 sql/benchmarks/tpch/Tests/08.stable.out sql/benchmarks/tpch/Tests/08.stable.out.int128 sql/benchmarks/tpch/Tests/09.stable.out sql/benchmarks/tpch/Tests/09.stable.out.int128 sql/benchmarks/tpch/Tests/10.stable.out sql/benchmarks/tpch/Tests/10.stable.out.int128 sql/benchmarks/tpch/Tests/11.stable.out sql/benchmarks/tpch/Tests/11.stable.out.int128 sql/benchmarks/tpch/Tests/14.stable.out sql/benchmarks/tpch/Tests/14.stable.out.int128 sql/benchmarks/tpch/Tests/15.stable.out sql/benchmarks/tpch/Tests/15.stable.out.int128 sql/benchmarks/tpch/Tests/17.stable.out sql/ben
MonetDB: mosaic - Merge with default
Changeset: acc60e17a0ec for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=acc60e17a0ec Added Files: README.rst debian/libmonetdb13.install sql/backends/monet5/Tests/pyapi33.sql sql/backends/monet5/Tests/pyapi33.stable.err sql/backends/monet5/Tests/pyapi33.stable.out sql/backends/monet5/sql_cast_impl_int.h sql/test/BugTracker-2017/Tests/All sql/test/BugTracker-2017/Tests/all_dates.csv.gz sql/test/BugTracker-2017/Tests/avggroupbysq.Bug-6178.sql sql/test/BugTracker-2017/Tests/avggroupbysq.Bug-6178.stable.err sql/test/BugTracker-2017/Tests/avggroupbysq.Bug-6178.stable.out sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.sql sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.err sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.sql sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.err sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.out sql/test/BugTracker-2017/Tests/crash_in_null_cast.Bug-6186.sql sql/test/BugTracker-2017/Tests/crash_in_null_cast.Bug-6186.stable.err sql/test/BugTracker-2017/Tests/crash_in_null_cast.Bug-6186.stable.out sql/test/BugTracker-2017/Tests/drop_not_null_on_pkey.Bug-6189.sql sql/test/BugTracker-2017/Tests/drop_not_null_on_pkey.Bug-6189.stable.err sql/test/BugTracker-2017/Tests/drop_not_null_on_pkey.Bug-6189.stable.out sql/test/BugTracker-2017/Tests/empty-interval.Bug-6184.sql sql/test/BugTracker-2017/Tests/empty-interval.Bug-6184.stable.err sql/test/BugTracker-2017/Tests/empty-interval.Bug-6184.stable.out sql/test/BugTracker-2017/Tests/heapextend.Bug-6134.sql.in sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.sql sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.stable.err sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.stable.out sql/test/BugTracker-2017/Tests/oidx-on-strings.Bug-6202.sql sql/test/BugTracker-2017/Tests/oidx-on-strings.Bug-6202.stable.err sql/test/BugTracker-2017/Tests/oidx-on-strings.Bug-6202.stable.out sql/test/BugTracker-2017/Tests/round-or-truncate.Bug-6193.sql sql/test/BugTracker-2017/Tests/round-or-truncate.Bug-6193.stable.err sql/test/BugTracker-2017/Tests/round-or-truncate.Bug-6193.stable.out sql/test/BugTracker-2017/Tests/semijoinunion.Bug-6150.sql sql/test/BugTracker-2017/Tests/semijoinunion.Bug-6150.stable.err sql/test/BugTracker-2017/Tests/semijoinunion.Bug-6150.stable.out sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.sql sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.stable.err sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.stable.out sql/test/BugTracker-2017/Tests/splitpart.Bug-6194.sql sql/test/BugTracker-2017/Tests/splitpart.Bug-6194.stable.err sql/test/BugTracker-2017/Tests/splitpart.Bug-6194.stable.out sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.sql sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.err sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.out sql/test/BugTracker-2017/Tests/union_func_crash.Bug-6196.sql sql/test/BugTracker-2017/Tests/union_func_crash.Bug-6196.stable.err sql/test/BugTracker-2017/Tests/union_func_crash.Bug-6196.stable.out sql/test/malloc_fail/Tests/mallocs.SQL.py sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.err sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out Removed Files: README debian/libmonetdb14.install sql/backends/monet5/sql_cast_impl_down_from_int.h sql/backends/monet5/sql_cast_impl_up_to_int.h sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.sql sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.err sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128 sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single sql/test/Tests/setoptimizer.stable.out.Windows sql/test/malloc_fail/Tests/initialize.sql sql/test/malloc_fail/Tests/initialize.stable.err sql/test/malloc_fail/Tests/initialize.stable.out sql/test/malloc_fail/Tests/setmemorylimit-fail.reqtests sql/test/malloc_fail/Tests/setmemorylimit-fail.sql sql/test/malloc_fail/Tests/setmemorylimit-fail.stable.err sql/test/malloc_fail/Tests/setmemorylimit-fail.stabl
MonetDB: mosaic - Merge with default
Changeset: ad84406a4d21 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad84406a4d21 Added Files: monetdb5/modules/mal/oltp.c monetdb5/modules/mal/oltp.h monetdb5/modules/mal/oltp.mal monetdb5/optimizer/opt_oltp.c monetdb5/optimizer/opt_oltp.h sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out.int128 Removed Files: sql/benchmarks/wisconsin/Tests/All sql/benchmarks/wisconsin/Tests/load.prologue5 sql/benchmarks/wisconsin/Tests/load.sql.src sql/benchmarks/wisconsin/Tests/load.stable.err sql/benchmarks/wisconsin/Tests/load.stable.out sql/benchmarks/wisconsin/Tests/load.timeout sql/benchmarks/wisconsin/Tests/wisconsin-select.reqtests sql/benchmarks/wisconsin/Tests/wisconsin-select.sql.src sql/benchmarks/wisconsin/Tests/wisconsin-select.stable.err sql/benchmarks/wisconsin/Tests/wisconsin-select.stable.out sql/benchmarks/wisconsin/Tests/wisconsin-update.reqtests sql/benchmarks/wisconsin/Tests/wisconsin-update.sql.src sql/benchmarks/wisconsin/Tests/wisconsin-update.stable.err sql/benchmarks/wisconsin/Tests/wisconsin-update.stable.out sql/benchmarks/wisconsin/load.sql sql/benchmarks/wisconsin/wisconsin-select.sql sql/benchmarks/wisconsin/wisconsin-update.sql sql/benchmarks/wisconsin/wisconsin.sql Modified Files: HowToStart.rst Makefile.ag NT/Makefile NT/installer32/cv64-32.sh NT/installer64/cv32-64.sh NT/installer64/fixmsi.py NT/monetdb_config.h.in NT/rules.msc NT/updatecodes.py NT/wincompile.py NT/winconfig.py README bootstrap buildtools/Makefile.ag buildtools/autogen/autogen.py buildtools/autogen/autogen/am.py buildtools/autogen/autogen/codegen.py buildtools/autogen/autogen/filesplit.py buildtools/autogen/autogen/msc.py buildtools/autogen/autogen/var.py buildtools/autogen/setup.py buildtools/conf/Maddlog buildtools/conf/Makefile.ag buildtools/conf/fixlicense.py buildtools/conf/rules.mk buildtools/conf/website.html buildtools/doc/HowToRelease.rst buildtools/doc/windowsbuild.rst clients/Makefile.ag clients/NT/Makefile.ag clients/NT/mclient.bat clients/NT/msqldump.bat clients/NT/stethoscope.bat clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/examples/C/Makefile.ag clients/examples/C/sample0.c clients/examples/C/sample1.c clients/examples/C/sample4.c clients/examples/C/smack00.c clients/examples/C/smack01.c clients/examples/Makefile.ag clients/examples/perl/Makefile.ag clients/examples/perl/malsample.pl clients/examples/perl/sqlsample.pl clients/examples/php/Makefile.ag clients/examples/php/sqlsample.php clients/examples/python/basics.py clients/examples/python/mclient-python2.py clients/examples/python/mclient-python3.py clients/examples/python/perf.py clients/examples/python/sqlsample.py clients/mapiclient/Makefile.ag clients/mapiclient/ReadlineTools.c clients/mapiclient/ReadlineTools.h clients/mapiclient/dotfile.py clients/mapiclient/dotmonetdb.c clients/mapiclient/dotmonetdb.h clients/mapiclient/dump.c clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/mapiclient/mhelp.h clients/mapiclient/mnc.c clients/mapiclient/msqldump.c clients/mapiclient/msqldump.h clients/mapiclient/stethoscope.c clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/mapilib/Makefile.ag clients/mapilib/mapi.c clients/mapilib/mapi.h clients/mapilib/mapi.rc clients/mapilib/monetdb-mapi.pc.in clients/odbc/Makefile.ag clients/odbc/doc/ExcelMonetDB.html clients/odbc/doc/unixODBC.html clients/odbc/driver/Makefile.ag clients/odbc/driver/ODBCConvert.c clients/odbc/driver/ODBCDbc.c clients/odbc/driver/ODBCDbc.h clients/odbc/driver/ODBCDesc.c clients/odbc/driver/ODBCDesc.h clients/odbc/driver/ODBCEnv.c clients/odbc/driver/ODBCEnv.h clients/odbc/driver/ODBCError.c clients/odbc/driver/ODBCError.h clients/odbc/driver/ODBCGlobal.h clients/odbc/driver/ODBCStmt.c clients/odbc/driver/ODBCStmt.h clients/odbc/driver/ODBCUtil.c clients/odbc/driver/ODBCUtil.h clients/odbc/driver/SQLAllocConnect.c client
MonetDB: mosaic - Merge with default
Changeset: a789e702d25c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a789e702d25c Added Files: monetdb5/tools/Tests/mserver5--help.stable.err.Windows sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_cat.h sql/backends/monet5/sql_transaction.c sql/backends/monet5/sql_transaction.h sql/backends/monet5/sql_transaction.mal sql/backends/monet5/sqlcatalog.mal sql/test/Tests/bincopycollist-prepare.py sql/test/sys-schema/Tests/All sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.sql sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.err sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.err sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out Removed Files: sql/test/Tests/bincopycollist-prepare.bat sql/test/Tests/bincopycollist-prepare.sh sql/test/Tests/bincopyint.bin Modified Files: clients/Tests/exports.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/mal/mal_parser.c monetdb5/optimizer/Tests/dataflow.stable.out monetdb5/optimizer/Tests/dataflow3.stable.out monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_garbageCollector.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_support.c sql/backends/monet5/40_sql.mal sql/backends/monet5/Makefile.ag sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_statement.c sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out sql/test/BugTracker-2016/Tests/All sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit sql/test/BugTracker-2016/Tests/storagemodel.stable.out.int128 sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.err sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.out sql/test/Tests/bincopycollist-prepare.stable.err sql/test/Tests/bincopycollist-prepare.stable.out sql/test/mapi/Tests/sql_int128.stable.out sql/test/mergetables/Tests/mergequery.stable.out sql/test/mosaic/Tests/compression.stable.out sql/test/mosaic/Tests/compressionRLE.stable.out sql/test/mosaic/Tests/compressionRLE2.stable.out sql/test/mosaic/Tests/xqueries.stable.out sql/test/mosaic/Tests/xqueries_delta.stable.out sql/test/mosaic/Tests/xqueries_rle.stable.out sql/test/remote/Tests/partition_elim.stable.out Branch: mosaic Log Message: Merge with default diffs (truncated from 8739 to 300 lines): 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 @@ -2046,6 +2046,21 @@ str affectedRowsRef; str aggrRef; str alarmRef; str algebraRef; +str alter_add_tableRef; +str alter_constraintRef; +str alter_del_tableRef; +str alter_functionRef; +str alter_indexRef; +str alter_roleRef; +str alter_schemaRef; +str alter_seqRef; +str alter_set_tableRef; +str alter_tableRef; +str alter_triggerRef; +str alter_typeRef; +str alter_userRef; +str alter_userRef; +str alter_viewRef; str andRef; str antijoinRef; str appendRef; @@ -2088,7 +2103,6 @@ str bstream_read_wrapwrap(int *res, Bstr str calcRef; str callMAL(Client cntxt, MalBlkPtr mb, MalStkPtr *glb, ValPtr argv[], char debug); int callString(Client c, str s, int listing); -str catalogRef; str catchKernelException(Client cntxt, str ret); void chkDeclarations(stream *out, MalBlkPtr mb); void chkFlow(stream *out, MalBlkPtr mb); @@ -2128,6 +2142,18 @@ str count_no_nilRef; int cpyConstant(MalBlkPtr mb, VarPtr vr); str createException(enum malexception, const char *, _In_z_ _Printf_format_string_ const char *, ...)
MonetDB: mosaic - Merge with default
Changeset: e102298467b2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e102298467b2 Added Files: sql/backends/monet5/Tests/createorreplace.sql sql/backends/monet5/Tests/createorreplace.stable.err sql/backends/monet5/Tests/createorreplace.stable.out sql/test/Tests/ifexists.sql sql/test/Tests/ifexists.stable.err sql/test/Tests/ifexists.stable.out sql/test/Tests/subqueries.sql sql/test/Tests/subqueries.stable.err sql/test/Tests/subqueries.stable.out Removed Files: sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit Modified Files: MonetDB.spec debian/control sql/backends/monet5/Tests/All sql/backends/monet5/sql.c sql/include/sql_relation.h sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_schema.c sql/server/rel_schema.h sql/server/sql_parser.y sql/server/sql_scan.c sql/storage/store.c sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/Tests/All sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.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.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/dump.stable.out sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/dump.stable.out sql/test/testdb-upgrade/Tests/dump.stable.out.Windows sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: mosaic Log Message: Merge with default diffs (truncated from 5647 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -136,6 +136,7 @@ BuildRequires: bzip2-devel %if %{?with_fits:1}%{!?with_fits:0} BuildRequires: cfitsio-devel %endif +BuildRequires: gcc %if %{?with_geos:1}%{!?with_geos:0} BuildRequires: geos-devel >= 3.4.0 %endif @@ -389,7 +390,7 @@ Recommends: perl-DBD-monetdb >= 1.0 Recommends: php-monetdb >= 1.0 %endif Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release} -Requires: python-monetdb >= 1.0 +Requires: python-pymonetdb >= 1.0 %description client-tests MonetDB is a database management system that is developed from a @@ -864,6 +865,7 @@ Group: Applications/Databases Requires: %{name}-testing = %{version}-%{release} Requires: %{name}-client-tests = %{version}-%{release} Requires: python +BuildArch: noarch %description testing-python MonetDB is a database management system that is developed from a diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -137,7 +137,7 @@ Depends: ${shlibs:Depends}, libmonetdb-c monetdb5-server (= ${source:Version}), libdbd-monetdb-perl (>= 1.0), php-monetdb (>= 1.0), - python-monetdb (>= 1.0), + python-pymonetdb (>= 1.0), monetdb5-sql (= ${source:Version}) Description: MonetDB client testing tools MonetDB is a database management system that is developed from a diff --git a/sql/backends/monet5/Tests/All b/sql/backends/monet5/Tests/All --- a/sql/backends/monet5/Tests/All +++ b/sql/backends/monet5/Tests/All @@ -61,6 +61,8 @@ HAVE_LIBPY?pyloader05 HAVE_LIBPY?pyloader06 HAVE_LIBPY?pyloader07 +HAVE_LIBPY?createorreplace + # should this work? #inlineUDF diff --git a/sql/backends/monet5/Tests/createorreplace.sql b/sql/backends/monet5/Tests/createorreplace.sql new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/createorreplace.sql @@ -0,0 +1,55 @@ +# Test 'CREATE OR REPLACE' functionality + +START TRANSACTION; +# first create the initial table and function +CREATE TABLE createorreplacetable(i INTEGER); +INSERT INTO createorreplacetable VALUES (2), (4), (6); + +# this simple function multiplies elements by 2 +CREATE FUNCTION createorreplacefunc(i INTEGER) RETURNS INTEGER LANGUAGE PYTHON { + return i * 2; +}; + +# (4), (8), (12) +SELECT createorreplacefunc(i) FROM createorreplacetable; + +COMMIT; + +START TRANSACTION; +# try to create the function again: this should fail +CREATE FUNCTION createorreplacefunc(i INTEGER) RETURNS INTEGER LANGUAGE PYTHON { return i * 3; }; +ROLLBACK; + +START TRANSACTION; +# now repl
MonetDB: mosaic - Merge with default
Changeset: 3da8dc47c446 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3da8dc47c446 Added Files: clients/Tests/exports.stable.err-noapprove clients/Tests/malcheck.stable.err-noapprove clients/Tests/malcheck.stable.out-noapprove debian/libmonetdb14.install sql/test/BugTracker-2015/Tests/long_insert.Bug-3845.timeout sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.sql sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.err sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out-noapprove sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err-noapprove sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out-noapprove sql/test/emptydb-upgrade-chain/Tests/check.stable.out-noapprove sql/test/emptydb-upgrade-chain/Tests/dump.stable.err-noapprove sql/test/emptydb-upgrade-chain/Tests/dump.stable.out-noapprove sql/test/emptydb-upgrade-hge/Tests/check.stable.out-noapprove sql/test/emptydb-upgrade-hge/Tests/dump.stable.err-noapprove sql/test/emptydb-upgrade-hge/Tests/dump.stable.out-noapprove sql/test/emptydb-upgrade/Tests/check.stable.out-noapprove sql/test/emptydb-upgrade/Tests/dump.stable.err-noapprove sql/test/emptydb-upgrade/Tests/dump.stable.out-noapprove sql/test/emptydb/Tests/dump.stable.err-noapprove sql/test/emptydb/Tests/dump.stable.out-noapprove Removed Files: ChangeLog.Jun2016 buildtools/ChangeLog.Jun2016 clients/ChangeLog.Jun2016 clients/mapilib/ChangeLog.Jun2016 common/stream/ChangeLog.Jun2016 debian/libmonetdb13.install gdk/ChangeLog.Jun2016 geom/ChangeLog.Jun2016 monetdb5/ChangeLog.Jun2016 sql/ChangeLog.Jun2016 testing/ChangeLog.Jun2016 tools/merovingian/ChangeLog.Jun2016 Modified Files: .hgtags ChangeLog-Archive ChangeLog.Dec2016 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.Dec2016 buildtools/autogen/autogen/msc.py clients/ChangeLog clients/R/Tests/All clients/R/Tests/dbi.stable.err clients/R/Tests/deps-install.R clients/R/Tests/deps-test.R clients/R/Tests/install.R clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out clients/Tests/malcheck.stable.out clients/examples/C/Makefile.ag clients/mapiclient/Makefile.ag clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/mapiclient/msqldump.h clients/mapiclient/tomograph.c clients/mapilib/mapi.c clients/mapilib/mapi.h clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog debian/control debian/libmonetdb-stream8.install debian/monetdb-client-testing.install gdk/ChangeLog gdk/ChangeLog-Archive gdk/ChangeLog.Dec2016 gdk/gdk.h gdk/gdk_align.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_delta.c gdk/gdk_group.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_orderidx.c gdk/gdk_private.h gdk/gdk_select.c gdk/gdk_ssort_impl.h gdk/gdk_storage.c gdk/gdk_unique.c gdk/gdk_utils.c gdk/gdk_utils.h gdk/libbat.rc libversions monetdb5/ChangeLog monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Dec2016 monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/extras/mal_optimizer_template/opt_sql_append.c monetdb5/extras/rapi/Tests/rapi08.malC monetdb5/mal/Tests/dataflow01.malC monetdb5/mal/Tests/performanceTests/join.malC monetdb5/mal/Tests/selecttest.malC monetdb5/mal/Tests/tst005.stable.out monetdb5/mal/Tests/tst006.stable.out monetdb5/mal/Tests/tst019.stable.err monetdb5/mal/Tests/tst023.malC monetdb5/mal/Tests/tst027.stable.err monetdb5/mal/Tests/tst033.malC monetdb5/mal/Tests/tst034.mal
MonetDB: mosaic - Merge with default
Changeset: 18addf879076 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=18addf879076 Removed Files: clients/examples/C/sample2.c clients/examples/C/sample3.c sql/test/mapi/Tests/sample2.SQL.bat sql/test/mapi/Tests/sample2.SQL.sh sql/test/mapi/Tests/sample2.stable.err sql/test/mapi/Tests/sample2.stable.out sql/test/mapi/Tests/sample3.SQL.bat sql/test/mapi/Tests/sample3.SQL.sh sql/test/mapi/Tests/sample3.stable.err sql/test/mapi/Tests/sample3.stable.out Modified Files: MonetDB.spec clients/ChangeLog clients/Tests/exports.stable.out clients/examples/C/Makefile.ag clients/mapilib/mapi.c clients/mapilib/mapi.h debian/monetdb-client-testing.install monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/mal/Tests/tst661.stable.out monetdb5/mal/Tests/tst903.stable.out monetdb5/mal/mal_listing.c monetdb5/modules/mal/Tests/call00.stable.out monetdb5/modules/mal/pcre.c monetdb5/optimizer/Tests/ARexample.stable.out monetdb5/optimizer/Tests/dataflow4.stable.out monetdb5/optimizer/Tests/dataflow5.stable.out monetdb5/optimizer/Tests/inlineFunction.stable.out monetdb5/optimizer/Tests/inlineFunction2.stable.out monetdb5/optimizer/Tests/inlineFunction4.stable.out monetdb5/optimizer/Tests/projectionchain.stable.out monetdb5/optimizer/Tests/reorder00.stable.out monetdb5/optimizer/Tests/tst4004.stable.out monetdb5/optimizer/Tests/tst4030.stable.out sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out sql/backends/monet5/sql_upgrades.c sql/server/sql_scan.c sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.sql sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128 sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128 sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit sql/test/BugTracker-2016/Tests/storagemodel.stable.out.int128 sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.err sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.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.int128 sql/test/mapi/Tests/All sql/test/mapi/Tests/sql_int128.stable.out sql/test/mergetables/Tests/mergequery.stable.out sql/test/mosaic/Tests/compression.stable.out sql/test/mosaic/Tests/compressionRLE.stable.out sql/test/mosaic/Tests/compressionRLE2.stable.out sql/test/mosaic/Tests/mix.stable.out sql/test/mosaic/Tests/session_exit.stable.out sql/test/mosaic/Tests/xqueries.stable.out sql/test/mosaic/Tests/xqueries_delta.stable.out sql/test/mosaic/Tests/xqueries_rle.stable.out sql/test/pg_regress/Tests/comments.stable.err sql/test/pg_regress/Tests/comments.stable.out sql/test/remote/Tests/partition_elim.stable.out sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.
MonetDB: mosaic - Merge with default
Changeset: 92f0180fc6e9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92f0180fc6e9 Added Files: clients/mapiclient/dotfile.py clients/mapiclient/mhelp.c clients/mapiclient/mhelp.h monetdb5/optimizer/Tests/flowgraph.malC monetdb5/optimizer/Tests/flowgraph.stable.err monetdb5/optimizer/Tests/flowgraph.stable.out sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.bat sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.sh sql/jdbc/tests/Tests/Test_PSlargeamount.stable.err sql/jdbc/tests/Tests/Test_PSlargeamount.stable.out sql/jdbc/tests/Tests/Test_PSlargeresponse.SQL.bat sql/jdbc/tests/Tests/Test_PSlargeresponse.SQL.sh sql/jdbc/tests/Tests/Test_PSlargeresponse.stable.err sql/jdbc/tests/Tests/Test_PSlargeresponse.stable.out sql/jdbc/tests/Tests/Test_Smoreresults.SQL.bat sql/jdbc/tests/Tests/Test_Smoreresults.SQL.sh sql/jdbc/tests/Tests/Test_Smoreresults.stable.err sql/jdbc/tests/Tests/Test_Smoreresults.stable.out sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.stable.err sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.stable.out sql/test/BugTracker-2016/Tests/crash.Bug-6081.sql sql/test/BugTracker-2016/Tests/crash.Bug-6081.stable.err sql/test/BugTracker-2016/Tests/crash.Bug-6081.stable.out sql/test/BugTracker-2016/Tests/dce.Bug-6114.sql sql/test/BugTracker-2016/Tests/dce.Bug-6114.stable.err sql/test/BugTracker-2016/Tests/dce.Bug-6114.stable.out sql/test/BugTracker-2016/Tests/dce2.Bug-6115.sql sql/test/BugTracker-2016/Tests/dce2.Bug-6115.stable.err sql/test/BugTracker-2016/Tests/dce2.Bug-6115.stable.out sql/test/BugTracker-2016/Tests/semijoin.Bug-6116.sql sql/test/BugTracker-2016/Tests/semijoin.Bug-6116.stable.err sql/test/BugTracker-2016/Tests/semijoin.Bug-6116.stable.out sql/test/BugTracker-2016/Tests/split_project.Bug-6117.sql sql/test/BugTracker-2016/Tests/split_project.Bug-6117.stable.err sql/test/BugTracker-2016/Tests/split_project.Bug-6117.stable.out Removed Files: monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single sql/benchmarks/ssbm/Tests/01-explain.SQL.py.src sql/benchmarks/ssbm/Tests/01-explain.reqtests sql/benchmarks/ssbm/Tests/01-explain.stable.err sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/01-plan.SQL.py.src sql/benchmarks/ssbm/Tests/01-plan.reqtests sql/benchmarks/ssbm/Tests/01-plan.stable.err sql/benchmarks/ssbm/Tests/01-plan.stable.out sql/benchmarks/ssbm/Tests/02-explain.SQL.py.src sql/benchmarks/ssbm/Tests/02-explain.reqtests sql/benchmarks/ssbm/Tests/02-explain.stable.err sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-plan.SQL.py.src sql/benchmarks/ssbm/Tests/02-plan.reqtests sql/benchmarks/ssbm/Tests/02-plan.stable.err sql/benchmarks/ssbm/Tests/02-plan.stable.out sql/benchmarks/ssbm/Tests/03-explain.SQL.py.src sql/benchmarks/ssbm/Tests/03-explain.reqtests sql/benchmarks/ssbm/Tests/03-explain.stable.err sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-plan.SQL.py.src sql/benchmarks/ssbm/Tests/03-plan.reqtests sql/benchmarks/ssbm/Tests/03-plan.stable.err sql/benchmarks/ssbm/Tests/03-plan.stable.out sql/benchmarks/ssbm/Tests/04-explain.SQL.py.src sql/benchmarks/ssbm/Tests/04-explain.reqtests sql/benchmarks/ssbm/Tests/04-explain.stable.err sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-plan.SQL.py.src sql/benchmarks/ssbm/Tests/04-plan.reqtests sql/benchmarks/ssbm/Tests/04-plan.stable.err sql/benchmarks/ssbm/Tests/04-plan.stable.out sql/benchmarks/ssbm/Tests/05-explain.SQL.py.src sql/benchmarks/ssbm/Tests/05-explain.reqtests sql/benchmarks/ssbm/Tests/05-explain.stable.err sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-plan.SQL.py.src sql/benchmarks/ssbm/Tests/05-plan.reqtests sql/benchmarks/ssbm/Tests/05-plan.stable.err sql/benchmarks/ssbm/Tests/05-plan.stable.out sql/benchmarks/ssbm/Tests/06-explain.SQL.py.src sql/benchmarks/ssbm/Tests/06-explain.reqtests sql/benchmarks/ssbm/Te
MonetDB: mosaic - merge with default
Changeset: 65a90c4291d8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65a90c4291d8 Added Files: sql/test/BugTracker-2016/Tests/merge-table-edit.Bug-6084.sql sql/test/BugTracker-2016/Tests/merge-table-edit.Bug-6084.stable.err sql/test/BugTracker-2016/Tests/merge-table-edit.Bug-6084.stable.out Modified Files: clients/R/Tests/All clients/R/Tests/dbi.stable.err clients/R/Tests/deps-install.R clients/R/Tests/deps-test.R clients/R/Tests/install.R clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 debian/monetdb5-sql.init.d gdk/gdk_logger.c monetdb5/extras/rapi/Tests/rapi02.stable.out monetdb5/extras/rapi/Tests/rapi08.malC monetdb5/mal/mal_instruction.c monetdb5/optimizer/opt_mergetable.c sql/backends/monet5/UDF/pyapi/pyapi.c sql/backends/monet5/mal_backend.h sql/backends/monet5/rel_bin.c sql/backends/monet5/rel_bin.h sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql_bat2time.c sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_fround.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_gencode.h sql/backends/monet5/sql_round.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/backends/monet5/sql_upgrades.c sql/benchmarks/ssbm/Tests/01-13.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-explain.stable.out sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/11-explain.stable.out sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/13-explain.stable.out sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/04-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/06-explain.stable.out sql/benchmarks/tpch/Tests/06-explain.stable.out.int128 sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/07-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 sql/benchmarks/tpch/Tests/12-explain.stable.out sql/benchmarks/tpch/Tests/12-explain.stable.out.int128 sql/benchmarks/tpch/Tests/13-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/15-explain.stable.out sql/benchmarks/tpch/Tests/15-explain.stable.out.int
MonetDB: mosaic - Merge with default
Changeset: f7c218b60924 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7c218b60924 Modified Files: common/utils/msabaoth.c sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01-plan.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/03-plan.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-plan.stable.out sql/benchmarks/tpch/Tests/06-explain.stable.out sql/benchmarks/tpch/Tests/06-plan.stable.out sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/07-plan.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/08-plan.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/09-plan.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/10-plan.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/11-plan.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/14-plan.stable.out sql/benchmarks/tpch/Tests/15-explain.stable.out sql/benchmarks/tpch/Tests/15-plan.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/17-plan.stable.out sql/benchmarks/tpch/Tests/18-plan.stable.out sql/benchmarks/tpch/Tests/19-explain.stable.out sql/benchmarks/tpch/Tests/19-plan.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-plan.stable.out tools/merovingian/daemon/client.c tools/merovingian/daemon/connections.c tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/discoveryrunner.c tools/merovingian/daemon/forkmserver.c tools/merovingian/daemon/handlers.c tools/merovingian/daemon/handlers.h tools/merovingian/daemon/merovingian.c tools/merovingian/daemon/merovingian.h tools/merovingian/daemon/multiplex-funnel.c tools/merovingian/utils/properties.c Branch: mosaic Log Message: Merge with default diffs (truncated from 1527 to 300 lines): diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c --- a/common/utils/msabaoth.c +++ b/common/utils/msabaoth.c @@ -594,6 +594,85 @@ msab_getSingleStatus(const char *pathbuf sdb->path = strdup(buf); sdb->dbname = sdb->path + strlen(sdb->path) - strlen(dbname); + + /* check the state of the server by looking at its gdk lock: +* - if we can lock it, the server has crashed or isn't running +* - if we can't open it because it's locked, the server is +* running +* - to distinguish between a crash and proper shutdown, consult +* the uplog +* - one exception to all above; if this is the same process, we +* cannot lock (it always succeeds), hence, if we have the +* same signature, we assume running if the uplog states so. +*/ + snprintf(buf, sizeof(buf), "%s/%s/%s", pathbuf, dbname, +_sabaoth_internal_uuid); + if (stat(buf, &statbuf) != -1) { + /* database has the same process signature as ours, which +* means, it must be us, rely on the uplog state */ + snprintf(log, sizeof(log), "%s/%s/%s", pathbuf, dbname, UPLOGFILE); + if ((f = fopen(log, "r")) != NULL) { + (void)fseek(f, -1, SEEK_END); + if (fread(data, 1, 1, f) != 1) { + /* the log is empty, assume no crash */ + sdb->state = SABdbInactive; + } else if (data[0] == '\t') { + /* see if the database has finished starting */ + snprintf(buf, sizeof(buf), "%s/%s/%s", +pathbuf, dbname, STARTEDFILE); + if (stat(buf, &statbuf) == -1) { + sdb->state = SABdbStarting; + } else { + sdb->state = SABdbRunning; + } + } else { /* should be \n */ + sdb->state = SABdbInactive; + } + (void)fclose(f); + } + } else if ((snprintf(buf, sizeof(buf), "%s/%s/%s", pathbuf, dbname, ".gdk_lock") > 0) & /* no typo */ + ((fd = MT_lockf(buf, F_TEST, 4, 1)) == -2)) {
MonetDB: mosaic - Merge with default
Changeset: d40348d70cf0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d40348d70cf0 Added Files: ChangeLog.Dec2016 buildtools/ChangeLog.Dec2016 clients/ChangeLog.Dec2016 clients/mapilib/ChangeLog.Dec2016 common/stream/ChangeLog.Dec2016 gdk/ChangeLog.Dec2016 geom/ChangeLog.Dec2016 monetdb5/ChangeLog.Dec2016 sql/ChangeLog.Dec2016 sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.sql sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.stable.err sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.stable.out sql/test/BugTracker-2016/Tests/assert-on-push-project-up.Bug-6077.sql sql/test/BugTracker-2016/Tests/assert-on-push-project-up.Bug-6077.stable.err sql/test/BugTracker-2016/Tests/assert-on-push-project-up.Bug-6077.stable.out sql/test/BugTracker-2016/Tests/assert-on-table-producing-function.Bug-6076.sql sql/test/BugTracker-2016/Tests/assert-on-table-producing-function.Bug-6076.stable.err sql/test/BugTracker-2016/Tests/assert-on-table-producing-function.Bug-6076.stable.out sql/test/BugTracker-2016/Tests/ifthenelse-void.Bug-6075.sql sql/test/BugTracker-2016/Tests/ifthenelse-void.Bug-6075.stable.err sql/test/BugTracker-2016/Tests/ifthenelse-void.Bug-6075.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit sql/test/emptydb-upgrade/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.32bit testing/ChangeLog.Dec2016 tools/merovingian/ChangeLog.Dec2016 Removed Files: monetdb5/optimizer/opt_factorize.c monetdb5/optimizer/opt_factorize.h tools/merovingian/daemon/peering.c tools/merovingian/daemon/peering.h Modified Files: .hgtags ChangeLog 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 clients/Tests/exports.stable.out clients/mapiclient/dotmonetdb.c clients/mapiclient/dotmonetdb.h clients/mapiclient/mclient.1 clients/mapiclient/mclient.c clients/mapiclient/msqldump.c clients/mapiclient/stethoscope.c clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc common/utils/msabaoth.c common/utils/mutils.c common/utils/mutils.h configure.ag gdk/ChangeLog gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_select.c gdk/libbat.rc monetdb5/ChangeLog monetdb5/extras/mal_optimizer_template/opt_sql_append.c monetdb5/mal/mal_builder.c monetdb5/mal/mal_function.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_parser.c monetdb5/modules/mal/clients.mal monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/orderidx.c monetdb5/optimizer/Makefile.ag monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_generator.c monetdb5/optimizer/opt_json.c monetdb5/optimizer/opt_matpack.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_remap.c monetdb5/optimizer/opt_remoteQueries.c monetdb5/optimizer/opt_volcano.c monetdb5/optimizer/opt_wrapper.c monetdb5/optimizer/optimizer.mal monetdb5/tools/libmonetdb5.rc sql/ChangeLog sql/backends/monet5/Tests/pyapi29.stable.out sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.out sql/backends/monet5/vaults/bam/Tests/mergetable.stable.out sql/backends/monet5/vaults/bam/Tests/query1.1.stable.out sql/backends/monet5/vaults/bam/Tests/query1.2.stable.out sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out sql/backends/monet5/vaults/bam/Tests/query2.11.stable.out sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out sql/backends/monet5/vaults/bam/Tests/query2.2.stabl
MonetDB: mosaic - merge with default
Changeset: cba8b49889bc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cba8b49889bc Added Files: sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.SQL.bat sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.SQL.sh sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.stable.err sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.stable.out sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.SQL.bat sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.SQL.sh sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.err sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.out sql/jdbc/tests/Tests/Test_Wrapper.SQL.bat sql/jdbc/tests/Tests/Test_Wrapper.SQL.sh sql/jdbc/tests/Tests/Test_Wrapper.stable.err sql/jdbc/tests/Tests/Test_Wrapper.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit sql/test/BugTracker-2016/Tests/cast_and_floor.Bug-6071.sql sql/test/BugTracker-2016/Tests/cast_and_floor.Bug-6071.stable.err sql/test/BugTracker-2016/Tests/cast_and_floor.Bug-6071.stable.out sql/test/BugTracker-2016/Tests/name_conflict_in_union.Bug-6065.sql sql/test/BugTracker-2016/Tests/name_conflict_in_union.Bug-6065.stable.err sql/test/BugTracker-2016/Tests/name_conflict_in_union.Bug-6065.stable.out sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.sql sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out.int128 sql/test/BugTracker-2016/Tests/union.Bug-6069.sql sql/test/BugTracker-2016/Tests/union.Bug-6069.stable.err sql/test/BugTracker-2016/Tests/union.Bug-6069.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/pg_regress/Tests/oid.stable.out.oid32 sql/test/pg_regress/Tests/without_oid.stable.out.oid32 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/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/mapilib/Makefile.ag clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog gdk/gdk_atoms.c gdk/gdk_hash.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_select.c gdk/gdk_system.c gdk/gdk_utils.c gdk/libbat.rc geom/sql/conformance/Tests/T10.stable.out geom/sql/conformance/Tests/T11.stable.out geom/sql/conformance/Tests/T12.stable.out geom/sql/conformance/Tests/T13.stable.out geom/sql/conformance/Tests/T14.stable.out geom/sql/conformance/Tests/T15.stable.out geom/sql/conformance/Tests/T16.stable.out geom/sql/conformance/Tests/T17.stable.out geom/sql/conformance/Tests/T18.stable.out geom/sql/conformance/Tests/T21.stable.out geom/sql/conformance/Tests/T22.stable.out geom/sql/conformance/Tests/T23.stable.out geom/sql/conformance/Tests/T24.stable.out geom/sql/conformance/Tests/T25.stable.out geom/sql/conformance/Tests/T26.stable.out geom/sql/conformance/Tests/T27.stable.out geom/sql/conformance/Tests/T28.stable.out geom/sql/conformance/Tests/T29.stable.out geom/sql/conformance/Tests/T30.stable.out geom/sql/conformance/Tests/T31.stable.out geom/sql/conformance/Tests/T32.stable.out geom/sql/conformance/Tests/T33.stable.out geom/sql/conformance/Tests/T34.stable.out geom/sql/conformance/Tests/T35.stable.out geom/sql/conformance/Tests/T36.stable.out geom/sql/conformance/Tests/T37.stable.out geom/sql/conformance/Tests/T38.stable.out geom/sql/conformance/Tests/T39.stable.out geom/sql/conformance/Tests/T40.stable.out geom/sql/conformance/Tests/T41.stable.out geom/sql/conformance/Tests/T42.stable.out geom/sql/conformance/Tests/T43.stable.out geom/sql/conformance/Tests/T44.stable.out geom/sql/conformance/Tests/T
MonetDB: mosaic - merge with default
Changeset: 556a02d2874a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=556a02d2874a Added Files: monetdb5/modules/mal/Tests/clients-hashes.stable.out.Darwin sql/test/BugTracker-2016/Tests/outer_constant_predicate.Bug-4070.sql sql/test/BugTracker-2016/Tests/outer_constant_predicate.Bug-4070.stable.err sql/test/BugTracker-2016/Tests/outer_constant_predicate.Bug-4070.stable.out sql/test/BugTracker-2016/Tests/prepare_without_querycache.Bug-4047.sql sql/test/BugTracker-2016/Tests/prepare_without_querycache.Bug-4047.stable.err sql/test/BugTracker-2016/Tests/prepare_without_querycache.Bug-4047.stable.out 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.Jun2016 clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/Tests/malcheck.sh clients/mapilib/mapi.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc common/stream/stream.c common/utils/mcrypt.c common/utils/mcrypt.h configure.ag debian/changelog debian/fix-deb.sh gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc.h gdk/gdk_calc_compare.h gdk/gdk_heap.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_utils.c gdk/libbat.rc geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err libversions monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/mal/Makefile.ag monetdb5/mal/mal_authorize.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_session.c monetdb5/modules/mal/01_batcalc.mal monetdb5/modules/mal/01_batcalc.mal.sh monetdb5/modules/mal/Tests/clients-hashes.malC monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/tablet.c monetdb5/optimizer/Tests/dataflow3.stable.out monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_matpack.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_projectionpath.c monetdb5/optimizer/opt_support.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_scenario.c sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/14.stable.out sql/benchmarks/tpch/LOCKED/Tests/14.stable.out.int128 sql/benchmarks/tpch/Tests/01-22.stable.out sql/benchmarks/tpch/Tests/01-22.stable.out.int128 sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01-plan.stable.out.int128 sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/14-plan.stable.out.int128 sql/benchmarks/tpch/Tests/14.stable.out sql/benchmarks/tpch/Tests/14.stable.out.int128 sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/17-plan.stable.out sql/benchmarks/tpch/Tests/17-plan.stable.out.int128 sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-plan.stable.out.int128 sql/server/rel_optimizer.c sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.stable.out sql/test/BugTracker-2008/Tests/copy-format.SF-2468513.stable.err sql/test/BugTracker-2008/Tests/varchar.SF-2471371.stable.err sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out sql/test/BugTracker-2009/Tests/copy_into_error_off_by_one.SF-2833696.stable.err sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out sql/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out sql/test/BugTracker-2016/Tests/All sql/test/BugTracker/Tests/copy_decimal.SF-1582957.stable.err sql/test/BugTracker/Tests/copy_overflow_null_bug.SF-1842550.s
MonetDB: mosaic - Merge with default
Changeset: abd92a970269 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=abd92a970269 Modified Files: gdk/gdk_bitvector.c monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/modules/mosaic/mosaic.c monetdb5/modules/mosaic/mosaic.h monetdb5/modules/mosaic/mosaic.mal monetdb5/modules/mosaic/mosaic_prefix.c sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out sql/backends/monet5/sql_upgrades.c sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/04-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/06-explain.stable.out.int128 sql/benchmarks/tpch/Tests/07-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 sql/benchmarks/tpch/Tests/12-explain.stable.out.int128 sql/benchmarks/tpch/Tests/13-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/15-explain.stable.out.int128 sql/benchmarks/tpch/Tests/16-explain.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/18-explain.stable.out.int128 sql/benchmarks/tpch/Tests/19-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 sql/benchmarks/tpch/Tests/21-explain.stable.out sql/benchmarks/tpch/Tests/22-explain.stable.out.int128 sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128 sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/Tests/setoptimizer.stable.out sql/test/Tests/setoptimizer.stable.out.Windows sql/test/mergetables/Tests/mergequery.stable.out sql/test/mosaic/Tests/compression.stable.out sql/test/mosaic/Tests/compressionRLE.stable.out sql/test/mosaic/Tests/compressionRLE2.stable.out sql/test/mosaic/Tests/mix.sql sql/test/mosaic/Tests/session_exit.stable.out sql/test/mosaic/Tests/x sql/test/mosaic/Tests/xqueries.stable.out sql/test/mosaic/Tests/xqueries_delta.stable.out sql/test/mosaic/Tests/xqueries_rle.stable.out Branch: mosaic Log Message: Merge with default And fixing prefix encoding diffs (truncated from 4823 to 300 lines): diff --git a/gdk/gdk_bitvector.c b/gdk/gdk_bitvector.c --- a/gdk/gdk_bitvector.c +++ b/gdk/gdk_bitvector.c @@ -80,7 +80,7 @@ getBitVector(BitVector vector, BUN i, in // spread over two cells m1 = BITS - shift; value = ((vector[cid] & (masks[m1]<> shift) | ((vector[cid+1] & masks[bits - m1]) << m1); - //printf("#setBitVector %ld i "BUNFMT" bits %d value %3d cell %10d %10d cid "BUNFMT" shift %d m1 %d\n",(long)vector,i,bits, value, vector[cid], vector[cid+1],cid,shift,m1); + //printf("#getBitVector %ld i "BUNFMT" bits %d value %3d cell %10d %10d cid "BUNFMT" shift %d m1 %d\n",(long)vector,i,bits, value, vector[cid], vector[cid+1],cid,shift,m1); } return value; } @@ -109,7 +109,7 @@ setBitVector(BitVector vector, const BUN m1 = BITS - shif
MonetDB: mosaic - Merge with default
Changeset: d5fea730a2e1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d5fea730a2e1 Added Files: monetdb5/mal/Tests/tst023.malC monetdb5/mal/Tests/tst023.stable.err monetdb5/mal/Tests/tst023.stable.out monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_emptybind.h monetdb5/optimizer/opt_jit.c monetdb5/optimizer/opt_jit.h sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.sql sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.stable.err sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.stable.out sql/test/BugTracker-2016/Tests/simpletest.stable.err sql/test/BugTracker-2016/Tests/simpletest.stable.out Removed Files: sql/test/pg_regress/Tests/oid.stable.err.Windows Modified Files: NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.SQL.py clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out configure.ag gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_atoms.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc_compare.h gdk/gdk_calc_private.h gdk/gdk_firstn.c gdk/gdk_group.c gdk/gdk_hash.h gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_system_private.h gdk/gdk_utils.c gdk/gdk_value.c geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err geom/sql/40_geom.sql java/ChangeLog java/ChangeLog.Jun2016 java/src/main/java/nl/cwi/monetdb/client/JdbcClient.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java java/src/main/java/nl/cwi/monetdb/util/CmdLineOpts.java java/src/main/java/nl/cwi/monetdb/util/OptionsException.java java/src/main/java/nl/cwi/monetdb/util/SQLExporter.java java/tests/BugDatabaseMetaData_Bug_3356.java monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single monetdb5/extras/mal_optimizer_template/opt_sql_append.c monetdb5/extras/rapi/Tests/rapi02.malC monetdb5/extras/rapi/Tests/rapi02.stable.out monetdb5/extras/rapi/rapi.c monetdb5/mal/Tests/All monetdb5/mal/Tests/tst901a.stable.out monetdb5/mal/mal.c monetdb5/mal/mal_builder.c monetdb5/mal/mal_builder.h monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_function.c monetdb5/mal/mal_function.h monetdb5/mal/mal_import.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_interpreter.h monetdb5/mal/mal_linker.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_listing.h monetdb5/mal/mal_module.c monetdb5/mal/mal_namespace.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_private.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resolve.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_session.c monetdb5/mal/mal_stack.h monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/color.c monetdb5/modules/atoms/identifier.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/str.c monetdb5/modules/atoms/streams.c monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/aggr.mal monetdb5/modules/kernel/aggr.mal.sh monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/bat5.h monetdb5/modules/kernel/bat5.mal monetdb5/modules/kernel/microbenchmark.c monetdb5/modules/kernel/microbenchmark.h monetdb5/modules/kernel/status.c monetdb5/modules/mal/00_calc_hge.mal monetdb5/modules/mal/00_mkey_hge.mal monetdb5/modules/mal/01_batcalc.mal monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.int128 monetdb5/modules/mal/Tests/remote03.stable.err monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/batcalc.c monetdb5/module
MonetDB: mosaic - merge with default
Changeset: dbb1745111cd for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dbb1745111cd Added Files: buildtools/autogen/autogen/filesplit.py sql/benchmarks/tpch/Tests/02-explain.stable.out.32bit sql/benchmarks/tpch/Tests/02-plan.stable.out.32bit sql/benchmarks/tpch/Tests/13-plan.stable.out.32bit sql/benchmarks/tpch/Tests/16-plan.stable.out.32bit sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.err.32bit sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.32bit sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.sql sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.stable.err sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.stable.out sql/test/BugTracker-2016/Tests/innerjoin-leftjoin-or.Bug-4049.sql sql/test/BugTracker-2016/Tests/innerjoin-leftjoin-or.Bug-4049.stable.err sql/test/BugTracker-2016/Tests/innerjoin-leftjoin-or.Bug-4049.stable.out sql/test/BugTracker-2016/Tests/simpletest.sql sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.sql sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.stable.err sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.stable.out sql/test/lateral/Tests/All sql/test/lateral/Tests/lateral.sql sql/test/lateral/Tests/lateral.stable.err sql/test/lateral/Tests/lateral.stable.out sql/test/orderidx/Tests/simpletable.stable.out.32bit sql/test/orderidx/Tests/smalltable.stable.out.32bit sql/test/pg_regress/Tests/oid.stable.out.32bit sql/test/pg_regress/Tests/without_oid.stable.out.32bit Removed Files: sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out.32bit sql/test/Dependencies/Tests/Dependencies.stable.out.int128 Modified Files: buildtools/autogen/autogen/am.py buildtools/autogen/autogen/codegen.py buildtools/autogen/autogen/msc.py clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out clients/odbc/driver/README clients/odbc/driver/SQLBindParameter.c clients/odbc/driver/SQLBulkOperations.c clients/odbc/driver/SQLCopyDesc.c clients/odbc/driver/SQLDescribeParam.c clients/odbc/driver/SQLEndTran.c clients/odbc/driver/SQLExtendedFetch.c clients/odbc/driver/SQLFetchScroll.c clients/odbc/driver/SQLGetEnvAttr.c clients/odbc/driver/SQLGetFunctions.c clients/odbc/driver/SQLNumParams.c clients/odbc/driver/SQLSetDescRec.c clients/odbc/driver/SQLSetEnvAttr.c common/stream/stream.c configure.ag gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_calc.c gdk/gdk_calc.h gdk/gdk_cross.c gdk/gdk_heap.c gdk/gdk_storage.c gdk/gdk_unique.c gdk/gdk_utils.c gdk/gdk_value.c java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single monetdb5/mal/mal_builder.c monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_debugger.c monetdb5/mal/mal_debugger.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_linker.c monetdb5/mal/mal_module.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_runtime.c monetdb5/modules/at
MonetDB: mosaic - Merge with default
Changeset: 544b35d05740 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=544b35d05740 Modified Files: clients/Tests/exports.stable.out monetdb5/mal/mal.h monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_listing.c monetdb5/mal/mal_module.c monetdb5/mal/mal_module.h monetdb5/mal/mal_parser.c monetdb5/optimizer/opt_profiler.c sql/backends/monet5/sql_scenario.c Branch: mosaic Log Message: Merge with default diffs (267 lines): 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 @@ -2150,7 +2150,6 @@ str exportOperationRef; str export_tableRef; str fcnDefinition(MalBlkPtr mb, InstrPtr p, str s, int flg, str base, size_t len); int findGDKtype(int type); -int findInstruction(Module scope, MalBlkPtr mb, InstrPtr pci); Module findModule(Module scope, str name); str findRef; Scenario findScenario(str nme); diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h --- a/monetdb5/mal/mal.h +++ b/monetdb5/mal/mal.h @@ -151,7 +151,7 @@ typedef struct VARRECORD { int eolife; /* pc index when it should be garbage collected */ int depth; /* scope block depth, set to -1 if not used */ int worker; /* thread id of last worker producing it */ - str stc;/* rendering schema.table.column */ + char stc[2* IDLENGTH]; /* rendering schema.table.column, with little more space */ BUN rowcnt; /* estimated row count*/ } *VarPtr, VarRecord; @@ -181,14 +181,14 @@ typedef struct { lng rbytes; /* accumulated number of bytes read, currently ignored */ lng wbytes; /* accumulated number of bytes produced */ /* the core admin */ - str modname;/* module context */ - str fcnname;/* function name */ + str modname;/* module context, reference into namespace */ + str fcnname;/* function name, reference into namespace */ int argc, retc, maxarg; /* total and result argument count */ int argv[FLEXIBLE_ARRAY_MEMBER]; /* at least a few entries */ } *InstrPtr, InstrRecord; typedef struct MALBLK { - str binding;/* related C-function */ + char binding[IDLENGTH]; /* related C-function */ str help; /* supportive commentary */ oid tag;/* unique block tag */ struct MALBLK *alternative; diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c --- a/monetdb5/mal/mal_instruction.c +++ b/monetdb5/mal/mal_instruction.c @@ -120,7 +120,8 @@ newMalBlk(int maxvars, int maxstmts) mb->vtop = 0; mb->vid = 0; mb->vsize = maxvars; - mb->help = mb->binding = NULL; + mb->help = NULL; + mb->binding[0] = 0; mb->tag = 0; mb->errors = 0; mb->alternative = NULL; @@ -215,9 +216,7 @@ freeMalBlk(MalBlkPtr mb) if (mb->history) freeMalBlk(mb->history); - if (mb->binding) - GDKfree(mb->binding); - mb->binding = 0; + mb->binding[0] = 0; mb->tag = 0; if (mb->help) GDKfree(mb->help); @@ -282,7 +281,7 @@ copyMalBlk(MalBlkPtr old) mb->stmt[i] = copyInstruction(old->stmt[i]); mb->help = old->help ? GDKstrdup(old->help) : NULL; - mb->binding = old->binding ? GDKstrdup(old->binding) : NULL; + strncpy(mb->binding, old->binding, IDLENGTH); mb->errors = old->errors; mb->tag = old->tag; mb->typefixed = old->typefixed; @@ -816,8 +815,7 @@ cloneVariable(MalBlkPtr tm, MalBlkPtr mb setVarUDFtype(tm, res); if (isVarCleanup(mb, x)) setVarCleanup(tm, res); - if ( getSTC(mb,x) ) - setSTC(mb,x, getSTC(mb,x)); + strncpy(getSTC(tm,x),getSTC(mb,x), 2 *IDLENGTH); return res; } @@ -876,15 +874,13 @@ clearVariable(MalBlkPtr mb, int varid) v = getVar(mb, varid); if (v == 0) return; - if (v->stc) - GDKfree(v->stc); if (isVarConstant(mb, varid) || isVarDisabled(mb, varid)) VALclear(&v->value); v->type = 0; v->flags = 0; v->rowcnt = 0; v->eolife = 0; - v->stc = 0; + v->stc[0] = 0; } void diff --git a/monetdb5/mal/mal_instruction.h b/monetdb5/mal/mal_instruction.h --- a/monetdb5/mal/mal_instruction.h +
MonetDB: mosaic - Merge with default
Changeset: 80e4680c93d3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=80e4680c93d3 Added Files: clients/Tests/MAL-signatures.sql sql/backends/monet5/Tests/int_notation_1e5.sql sql/backends/monet5/Tests/int_notation_1e5.stable.err sql/backends/monet5/Tests/int_notation_1e5.stable.out sql/backends/monet5/Tests/pyapi31.stable.err sql/backends/monet5/Tests/pyapi31.stable.out sql/backends/monet5/Tests/pyloader01.sql sql/backends/monet5/Tests/pyloader01.stable.err sql/backends/monet5/Tests/pyloader01.stable.out sql/backends/monet5/Tests/pyloader02.sql sql/backends/monet5/Tests/pyloader02.stable.err sql/backends/monet5/Tests/pyloader02.stable.out sql/backends/monet5/Tests/pyloader03.sql sql/backends/monet5/Tests/pyloader03.stable.err sql/backends/monet5/Tests/pyloader03.stable.out sql/backends/monet5/Tests/pyloader04.sql sql/backends/monet5/Tests/pyloader04.stable.err sql/backends/monet5/Tests/pyloader04.stable.out sql/backends/monet5/Tests/pyloader05.sql sql/backends/monet5/Tests/pyloader05.stable.err sql/backends/monet5/Tests/pyloader05.stable.out sql/backends/monet5/Tests/pyloader06.sql sql/backends/monet5/Tests/pyloader06.stable.err sql/backends/monet5/Tests/pyloader06.stable.out sql/backends/monet5/Tests/pyloader07.sql sql/backends/monet5/Tests/pyloader07.stable.err sql/backends/monet5/Tests/pyloader07.stable.out sql/backends/monet5/UDF/pyapi/convert_loops.h sql/backends/monet5/UDF/pyapi/emit.c sql/backends/monet5/UDF/pyapi/emit.h sql/backends/monet5/UDF/pyapi/pyloader.c sql/test/BugTracker-2016/Tests/trigger_bulk.Bug-4045.sql sql/test/BugTracker-2016/Tests/trigger_bulk.Bug-4045.stable.err sql/test/BugTracker-2016/Tests/trigger_bulk.Bug-4045.stable.out sql/test/copy/Tests/columns.sql sql/test/copy/Tests/columns.stable.err sql/test/copy/Tests/columns.stable.out sql/test/malloc_fail/Tests/initialize.sql sql/test/malloc_fail/Tests/initialize.stable.err sql/test/malloc_fail/Tests/initialize.stable.out sql/test/malloc_fail/Tests/setmemorylimit-fail.reqtests sql/test/malloc_fail/Tests/setmemorylimit-fail2.reqtests sql/test/malloc_fail/Tests/setmemorylimit.reqtests Removed Files: clients/Tests/MAL-signatures.malC monetdb5/modules/mal/Tests/zorder.malC monetdb5/modules/mal/Tests/zorder.stable.err monetdb5/modules/mal/Tests/zorder.stable.out monetdb5/modules/mal/zorder.c monetdb5/modules/mal/zorder.h monetdb5/modules/mal/zorder.mal sql/backends/monet5/sql_readline.c sql/backends/monet5/sql_readline.h sql/scripts/24_zorder.sql Modified Files: NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out clients/Tests/malcheck.stable.out clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/mapiclient/stethoscope.c clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c common/stream/stream.c configure.ag gdk/ChangeLog gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_bbp.c gdk/gdk_bbp.h gdk/gdk_join.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_utils.c gdk/gdk_utils.h geom/monetdb5/30_geom.mal monetdb5/ChangeLog monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal monetdb5/extras/mal_optimizer_template/opt_sql_append.c monetdb5/extras/mal_optimizer_template/opt_sql_append.h monetdb5/extras/rapi/50_rapi.mal monetdb5/extras/rapi/rapi.c monetdb5/extras/sphinx/30_sphinx.mal monetdb5/mal/Makefile.ag monetdb5/mal/Tests/dynamicload.malC monetdb5/mal/Tests/dynamicload.stable.err monetdb5/mal/Tests/tst120a.malC monetdb5/mal/Tests/tst120a.stable.out monetdb5/mal/Tests/tst120b.malC monetdb5/mal/Tests/tst120b.stable.out monetdb5/mal/Tests/tst275.stable.out monetdb5/mal/Tests/tst804.stable.err monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_atom.c monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_debugger.c monetdb5/mal/mal_errors.h monetdb5/mal/mal_exception.c monetdb5/mal/mal_function.c monetdb5/mal/mal_impor
MonetDB: mosaic - merge with default
Changeset: 60cddcf3e588 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=60cddcf3e588 Added Files: sql/backends/monet5/Tests/pyapi32.sql sql/backends/monet5/Tests/pyapi32.stable.err sql/backends/monet5/Tests/pyapi32.stable.out sql/test/bugs/Tests/filter_error.sql sql/test/bugs/Tests/filter_error.stable.err sql/test/bugs/Tests/filter_error.stable.out Modified Files: clients/Tests/exports.stable.out gdk/gdk_utils.c monetdb5/mal/mal.h monetdb5/mal/mal_builder.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_type.h sql/backends/monet5/Tests/All sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out sql/backends/monet5/UDF/pyapi/pyapi.c sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-explain.stable.out sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/11-explain.stable.out sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/13-explain.stable.out sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/02-plan.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/04-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/06-explain.stable.out sql/benchmarks/tpch/Tests/06-explain.stable.out.int128 sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/07-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-plan.stable.out sql/benchmarks/tpch/Tests/09-plan.stable.out.int128 sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 sql/benchmarks/tpch/Tests/12-explain.stable.out sql/benchmarks/tpch/Tests/12-explain.stable.out.int128 sql/benchmarks/tpch/Tests/13-explain.stable.out sql/benchmarks/tpch/Tests/13-plan.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/15-explain.stable.out sql/benchmarks/tpch/Tests/15-explain.stable.out.int128 sql/benchmarks/tpch/Tests/16-explain.stable.out sql/benchmarks/tpch/Tests/16-plan.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/18-explain.stable.out sql/benchmarks/tpch/Tests/18-explain.stable.out.int128 sql/benchmarks/tpch/Tests/19-explain.stable.out sql/benchmarks/tpch/Tests/19-explain.stable.out.int128 sql/benchmarks/tpch/Tests/19-plan.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-plan.stable.out sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
MonetDB: mosaic - Merge with default
Changeset: 1262f3e47412 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1262f3e47412 Added Files: sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.sql sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.err sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.sql sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.err sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.err.int128 sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128 sql/test/malloc_fail/Tests/All sql/test/malloc_fail/Tests/setmemorylimit.sql sql/test/malloc_fail/Tests/setmemorylimit.stable.err sql/test/malloc_fail/Tests/setmemorylimit.stable.out Removed Files: monetdb5/mal/Tests/recycle00.malC monetdb5/mal/Tests/recycle00.stable.err monetdb5/mal/Tests/recycle00.stable.out monetdb5/mal/Tests/recycle01.malC monetdb5/mal/Tests/recycle01.stable.err monetdb5/mal/Tests/recycle01.stable.out monetdb5/mal/Tests/recycle02.malC monetdb5/mal/Tests/recycle02.stable.err monetdb5/mal/Tests/recycle02.stable.out monetdb5/mal/Tests/recycle03.malC monetdb5/mal/Tests/recycle03.stable.err monetdb5/mal/Tests/recycle03.stable.out monetdb5/mal/Tests/recycle04.malC monetdb5/mal/Tests/recycle04.stable.err monetdb5/mal/Tests/recycle04.stable.out monetdb5/mal/Tests/recycle05.malC monetdb5/mal/Tests/recycle05.stable.err monetdb5/mal/Tests/recycle05.stable.out monetdb5/mal/Tests/recycle07.malC monetdb5/mal/Tests/recycle07.stable.err monetdb5/mal/Tests/recycle07.stable.out monetdb5/mal/Tests/recycle08.malC monetdb5/mal/Tests/recycle08.stable.err monetdb5/mal/Tests/recycle08.stable.out monetdb5/mal/Tests/recycle10.malC monetdb5/mal/Tests/recycle10.stable.err monetdb5/mal/Tests/recycle10.stable.out monetdb5/mal/Tests/recycle11.malC monetdb5/mal/Tests/recycle11.stable.err monetdb5/mal/Tests/recycle11.stable.out monetdb5/mal/Tests/recycle12.malC monetdb5/mal/Tests/recycle12.stable.err monetdb5/mal/Tests/recycle12.stable.out monetdb5/mal/mal_recycle.c monetdb5/mal/mal_recycle.h monetdb5/modules/mal/recycle.c monetdb5/modules/mal/recycle.h monetdb5/modules/mal/recycle.mal monetdb5/optimizer/opt_recycler.c monetdb5/optimizer/opt_recycler.h sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.sql sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.stable.err sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.stable.out sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.err.oid32 sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.oid32 sql/test/pg_regress/Tests/oid.stable.err.64bit.oid32 sql/test/pg_regress/Tests/oid.stable.err.Windows.oid32 sql/test/pg_regress/Tests/oid.stable.err.oid32.int128 sql/test/pg_regress/Tests/oid.stable.out.oid32 sql/test/pg_regress/Tests/without_oid.stable.out.oid32 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.oid32 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.oid32 Modified Files: MonetDB.spec NT/monetdb_config.h.in NT/rules.msc buildtools/ChangeLog clients/Tests/All clients/Tests/exports.stable.out configure.ag gdk/gdk.h gdk/gdk_utils.c gdk/gdk_utils.h java/tests/Test_CisValid.java monetdb5/mal/Makefile.ag monetdb5/mal/Tests/All monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_exception.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_interpreter.h monetdb5/mal/mal_runtime.c monetdb5/modules/mal/Makefile.ag monetdb5/modules/mal/mal_init.mal monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_io.h monetdb5/modules/mal/mal_io.mal monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/remote.c monetdb5/optimizer/Makefile.ag monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_wrapper.c sql/ChangeLog sql/backends/monet5/sql.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_scenar
MonetDB: mosaic - Merge with default
Changeset: 2ebc7396991d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ebc7396991d 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/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog gdk/libbat.rc java/ChangeLog-Archive java/ChangeLog.Jun2016 java/Makefile.ag java/build.properties java/pom.xml java/release.txt libversions monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/mal/Tests/tst013.stable.err monetdb5/mal/Tests/tst903.stable.out monetdb5/mal/Tests/tst904.stable.out monetdb5/mal/Tests/tst907.stable.out monetdb5/mal/mal.h monetdb5/mal/mal_builder.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_function.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_session.c monetdb5/mal/mal_type.c monetdb5/mal/mal_type.h monetdb5/modules/mal/Tests/inspect00.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.int128 monetdb5/modules/mal/Tests/remote03.stable.err monetdb5/modules/mal/Tests/remote03.stable.out monetdb5/modules/mal/Tests/remote04.stable.out monetdb5/optimizer/Tests/Mexample.stable.out monetdb5/optimizer/Tests/dataflow.stable.out monetdb5/optimizer/Tests/dataflow3.stable.out monetdb5/optimizer/Tests/dataflow4.stable.out monetdb5/optimizer/Tests/inline00.stable.out monetdb5/optimizer/Tests/inline01.stable.out monetdb5/optimizer/Tests/inline02.stable.out monetdb5/optimizer/Tests/inline03.stable.out monetdb5/optimizer/Tests/inline04.stable.out monetdb5/optimizer/Tests/inline06.stable.out monetdb5/optimizer/Tests/inline07.stable.out monetdb5/optimizer/Tests/inline09.stable.out monetdb5/optimizer/Tests/inline10.stable.out monetdb5/optimizer/Tests/inline12.stable.out monetdb5/optimizer/Tests/inlineCst.stable.out monetdb5/optimizer/Tests/inlineFunction.stable.out monetdb5/optimizer/Tests/inlineFunction1.stable.out monetdb5/optimizer/Tests/inlineFunction2.stable.out monetdb5/optimizer/Tests/inlineFunction3.stable.out monetdb5/optimizer/Tests/inlineFunction4.stable.out monetdb5/optimizer/Tests/manifold2.stable.out monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_factorize.c monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_querylog.c monetdb5/optimizer/opt_remoteQueries.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_support.h monetdb5/tools/libmonetdb5.rc sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out sql/backends/monet5/UDF/pyapi/pyapi.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/11-explain.stable.out sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/13-explain.stable.out sql/benchmarks/ssbm/Tests/13-exp
MonetDB: mosaic - Merge with default branch.
Changeset: af44785ae783 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af44785ae783 Modified Files: monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/blob.h monetdb5/modules/atoms/color.h monetdb5/modules/atoms/identifier.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/json.h monetdb5/modules/atoms/mcurl.c monetdb5/modules/atoms/mtime.h monetdb5/modules/atoms/str.h monetdb5/modules/atoms/streams.h monetdb5/modules/atoms/url.c monetdb5/modules/atoms/url.h monetdb5/modules/atoms/uuid.c monetdb5/modules/atoms/xml.h monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/alarm.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/bat5.h monetdb5/modules/kernel/batcolor.h monetdb5/modules/kernel/batmmath.h monetdb5/modules/kernel/batstr.c monetdb5/modules/kernel/group.h monetdb5/modules/kernel/logger.c monetdb5/modules/kernel/microbenchmark.h monetdb5/modules/kernel/mmath.h monetdb5/modules/kernel/status.h monetdb5/modules/mal/batExtensions.h monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/bbp.h monetdb5/modules/mal/calc.c monetdb5/modules/mal/clients.h monetdb5/modules/mal/factories.h monetdb5/modules/mal/groupby.h monetdb5/modules/mal/inspect.h monetdb5/modules/mal/iterator.h monetdb5/modules/mal/json_util.h monetdb5/modules/mal/language.h monetdb5/modules/mal/mal_io.h monetdb5/modules/mal/mal_mapi.h monetdb5/modules/mal/manifold.h monetdb5/modules/mal/manual.h monetdb5/modules/mal/mat.h monetdb5/modules/mal/mdb.h monetdb5/modules/mal/mkey.h monetdb5/modules/mal/pcre.c monetdb5/modules/mal/profiler.h monetdb5/modules/mal/projectionpath.h monetdb5/modules/mal/querylog.h monetdb5/modules/mal/recycle.h monetdb5/modules/mal/remote.h monetdb5/modules/mal/sabaoth.h monetdb5/modules/mal/sample.h monetdb5/modules/mal/sysmon.h monetdb5/modules/mal/tablet.h monetdb5/modules/mal/tokenizer.h monetdb5/modules/mal/transaction.c monetdb5/modules/mal/txtsim.h monetdb5/modules/mal/zorder.h monetdb5/optimizer/opt_aliases.h monetdb5/optimizer/opt_candidates.h monetdb5/optimizer/opt_coercion.h monetdb5/optimizer/opt_commonTerms.h monetdb5/optimizer/opt_constants.h monetdb5/optimizer/opt_costModel.h monetdb5/optimizer/opt_dataflow.h monetdb5/optimizer/opt_deadcode.h monetdb5/optimizer/opt_evaluate.h monetdb5/optimizer/opt_factorize.h monetdb5/optimizer/opt_garbageCollector.h monetdb5/optimizer/opt_generator.h monetdb5/optimizer/opt_inline.h monetdb5/optimizer/opt_json.h monetdb5/optimizer/opt_macro.h monetdb5/optimizer/opt_matpack.h monetdb5/optimizer/opt_mergetable.h monetdb5/optimizer/opt_mitosis.h monetdb5/optimizer/opt_mosaic.h monetdb5/optimizer/opt_multiplex.h monetdb5/optimizer/opt_pipes.h monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_profiler.h monetdb5/optimizer/opt_projectionpath.h monetdb5/optimizer/opt_pushselect.h monetdb5/optimizer/opt_querylog.h monetdb5/optimizer/opt_recycler.h monetdb5/optimizer/opt_reduce.h monetdb5/optimizer/opt_remap.h monetdb5/optimizer/opt_remoteQueries.h monetdb5/optimizer/opt_reorder.h monetdb5/optimizer/opt_statistics.h monetdb5/optimizer/opt_support.h monetdb5/optimizer/opt_volcano.h monetdb5/optimizer/opt_wrapper.c monetdb5/optimizer/optimizer.h monetdb5/scheduler/run_adder.h monetdb5/scheduler/run_isolate.h monetdb5/scheduler/run_memo.h monetdb5/scheduler/run_pipeline.h monetdb5/scheduler/srvpool.h sql/backends/monet5/sql_execute.c testing/Mtest.py.in tools/merovingian/daemon/merovingian.c Branch: mosaic Log Message: Merge with default branch. diffs (truncated from 6251 to 300 lines): diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c --- a/monetdb5/modules/atoms/batxml.c +++ b/monetdb5/modules/atoms/batxml.c @@ -35,32 +35,26 @@ #include "mal_function.h" #include "xml.h" -#ifdef WIN32 -#define batxml_export extern __declspec(dllexport) -#else -#define batxml_export extern -#endif - -batxml_export str BATXMLxml2str(bat *ret, const bat *bid); -batxml_export str BATXMLxmltext(bat *ret, const bat *bid); -batxml_export str BATXMLstr2xml(bat *ret, const bat *bid); -batxml_export str BATXMLdocument(bat *ret, const bat *bid); -batxml_export str BATXMLcontent(bat *ret,
MonetDB: mosaic - Merge with default
Changeset: da36bf258d60 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da36bf258d60 Added Files: sql/test/BugTracker-2016/Tests/nested-mal-with-multiplex.Bug-4035.sql sql/test/BugTracker-2016/Tests/nested-mal-with-multiplex.Bug-4035.stable.err sql/test/BugTracker-2016/Tests/nested-mal-with-multiplex.Bug-4035.stable.out Modified Files: monetdb5/mal/mal_resolve.c sql/test/BugTracker-2016/Tests/All Branch: mosaic Log Message: Merge with default diffs (135 lines): diff --git a/monetdb5/mal/mal_resolve.c b/monetdb5/mal/mal_resolve.c --- a/monetdb5/mal/mal_resolve.c +++ b/monetdb5/mal/mal_resolve.c @@ -586,7 +586,7 @@ typeChecker(stream *out, Module scope, M p->typechk = TYPE_UNKNOWN; olderrors = mb->errors; - if (p->fcn && p->token >= FCNcall && p->token <= PATcall) { + if ((p->fcn || p->blk) && p->token >= FCNcall && p->token <= PATcall) { p->token = ASSIGNsymbol; p->fcn = NULL; p->blk = NULL; diff --git a/sql/test/BugTracker-2016/Tests/All b/sql/test/BugTracker-2016/Tests/All --- a/sql/test/BugTracker-2016/Tests/All +++ b/sql/test/BugTracker-2016/Tests/All @@ -36,3 +36,4 @@ RELEASE_SAVEPOINT_after_ALTER_TABLE_cras RELEASE_SAVEPOINT_after_UPDATE_crash.Bug-4010 analyze-quotes-incorrectly.Bug-4021 boolean-evaluation.Bug-4025 +HAVE_GEOM?nested-mal-with-multiplex.Bug-4035 diff --git a/sql/test/BugTracker-2016/Tests/nested-mal-with-multiplex.Bug-4035.sql b/sql/test/BugTracker-2016/Tests/nested-mal-with-multiplex.Bug-4035.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/nested-mal-with-multiplex.Bug-4035.sql @@ -0,0 +1,15 @@ +CREATE FUNCTION geographic_to_cartesian(lat FLOAT, lon FLOAT) RETURNS POINT /* convert geographic coordinates to Cartesian while creating a point */ +BEGIN +DECLARE deg_to_rad FLOAT, lat_rad FLOAT, lon_rad FLOAT, aux1 FLOAT, aux2 FLOAT; +SET deg_to_rad = pi() / 180; +SET lat_rad = lat * deg_to_rad; +SET lon_rad = lon * deg_to_rad; +SET aux1 = sys.cos(lat_rad); +SET aux2 = 6371 * aux1; +RETURN sys.st_makepoint(aux2 * sys.cos(lon_rad), aux2 * sys.sin(lon_rad), 6371 * sys.sin(lat_rad)); +END; +CREATE TABLE test_table (lat FLOAT, lon FLOAT); +SELECT geographic_to_cartesian(lat, lon) AS calc_point FROM test_table; + +DROP TABLE test_table; +DROP FUNCTION geographic_to_cartesian; diff --git a/sql/test/BugTracker-2016/Tests/nested-mal-with-multiplex.Bug-4035.stable.err b/sql/test/BugTracker-2016/Tests/nested-mal-with-multiplex.Bug-4035.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/nested-mal-with-multiplex.Bug-4035.stable.err @@ -0,0 +1,35 @@ +stderr of test 'nested-mal-with-multiplex.Bug-4035` in directory 'sql/test/BugTracker-2016` itself: + + +# 15:47:42 > +# 15:47:42 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33295" "--set" "mapi_usock=/var/tmp/mtest-30631/.s.monetdb.33295" "--set" "monet_prompt=" "--forcemito" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2016" "--set" "embedded_r=yes" +# 15:47:42 > + +# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 5 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 33295 +# cmdline opt mapi_usock = /var/tmp/mtest-30631/.s.monetdb.33295 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2016 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 15:47:43 > +# 15:47:43 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-30631" "--port=33295" +# 15:47:43 > + + +# 15:47:43 > +# 15:47:43 > "Done." +# 15:47:43 > + diff --git a/sql/test/BugTracker-2016/Tests/nested-mal-with-multiplex.Bug-4035.stable.out b/sql/test/BugTracker-2016/Tests/nested-mal-with-multiplex.Bug-4035.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/nested-mal-with-multiplex.Bug-4035.stable.out @@ -0,0 +1,50 @@ +stdout of test 'nested-mal-with-multiplex.Bug-4035` in directory 'sql/test/BugTracker-2016` itself: + + +# 15:47:42 > +# 15:47:42 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33295" "--set" "mapi_usock=/var/tmp/mtest-30631/.s.monetdb.33295" "--set" "monet_prompt=" "--forcemito" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2016" "--set" "embedded_r=yes" +# 15:47:42 > + +# MonetDB 5 server v11.23.6 (hg id: 4e7a78e
MonetDB: mosaic - Merge with default
Changeset: 2090ae325f78 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2090ae325f78 Modified Files: NT/Makefile NT/monetdb_config.h.in gdk/gdk_bbp.c gdk/gdk_logger.c java/ChangeLog.Jun2016 java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java Branch: mosaic Log Message: Merge with default diffs (truncated from 567 to 300 lines): diff --git a/NT/Makefile b/NT/Makefile --- a/NT/Makefile +++ b/NT/Makefile @@ -16,7 +16,7 @@ all: _all !INCLUDE "$(TOPDIR)\..\NT\rules.msc" -_all: update_winconfig_conds_py "$(srcdir)\Makefile.msc" monetdb_config.h unistd.h inttypes.h .monetdb +_all: update_winconfig_conds_py "$(srcdir)\Makefile.msc" monetdb_config.h unistd.h .monetdb $(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)" "bits=$(bits)" all install: targetdirs all @@ -46,14 +46,6 @@ unistd.h: $(ECHO) #endif >> unistd.h $(ECHO) #endif >> unistd.h -inttypes.h: - $(ECHO) typedef signed char int8_t; > inttypes.h - $(ECHO) typedef unsigned char uint8_t; >> inttypes.h - $(ECHO) typedef short int16_t; >> inttypes.h - $(ECHO) typedef unsigned short uint16_t; >> inttypes.h - $(ECHO) typedef int int32_t; >> inttypes.h - $(ECHO) typedef unsigned int uint32_t; >> inttypes.h - .monetdb: $(ECHO) user=monetdb> .monetdb $(ECHO) password=monetdb>> .monetdb 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 @@ -148,7 +148,7 @@ /* #undef HAVE_FDATASYNC */ /* Define to 1 if you have the header file. */ -#if !defined(_MSC_VER) || _MSC_VER > 1600 +#if !defined(_MSC_VER) || _MSC_VER >= 1800 #define HAVE_FENV_H 1 #endif @@ -234,7 +234,9 @@ /* #undef HAVE_IEEEFP_H */ /* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 /* generated by the Makefile */ +#if !defined(_MSC_VER) || _MSC_VER >= 1800 +#define HAVE_INTTYPES_H 1 +#endif /* Define to 1 if you have the header file. */ #define HAVE_IO_H 1 @@ -526,13 +528,15 @@ #define HAVE_SQLGETPRIVATEPROFILESTRING 1 /* Define to 1 if stdbool.h conforms to C99. */ -/* #undef HAVE_STDBOOL_H */ +#if !defined(_MSC_VER) || _MSC_VER >= 1800 +#define HAVE_STDBOOL_H 1 +#endif /* Define to 1 if you have the header file. */ #define HAVE_STDDEF_H 1 /* Define to 1 if you have the header file. */ -#if !defined(_MSC_VER) || _MSC_VER > 1600 +#if !defined(_MSC_VER) || _MSC_VER >= 1600 #define HAVE_STDINT_H 1 #endif diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c --- a/gdk/gdk_bbp.c +++ b/gdk/gdk_bbp.c @@ -76,6 +76,14 @@ #include "gdk_private.h" #include "gdk_storage.h" #include "mutils.h" + +#ifndef F_OK +#define F_OK 0 +#endif +#ifdef _MSC_VER +#define access(f, m) _access(f, m) +#endif + /* * The BBP has a fixed address, so re-allocation due to a growing BBP * caused by one thread does not disturb reads to the old entries by @@ -3653,6 +3661,18 @@ BBPsync(int cnt, bat *subcommit) if (BBP_status(i) & BBPEXISTING) { if (b != NULL && BBPbackup(b, subcommit != NULL) != GDK_SUCCEED) break; + } else if (subcommit && (b = BBP_desc(i)) && BBP_status(i) & BBPDELETED) { + char o[10]; + char *f; + snprintf(o, sizeof(o), "%o", b->batCacheid); + f = GDKfilepath(b->theap.farmid, BAKDIR, o, "tail"); + if (access(f, F_OK) == 0) + file_move(b->theap.farmid, BAKDIR, SUBDIR, o, "tail"); + GDKfree(f); + f = GDKfilepath(b->theap.farmid, BAKDIR, o, "theap"); + if (access(f, F_OK) == 0) + file_move(b->theap.farmid, BAKDIR, SUBDIR, o, "theap"); + GDKfree(f); } } if (idx < cnt) diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c --- a/gdk/gdk_logger.c +++ b/gdk/gdk_logger.c @@ -1250,7 +1250,6 @@ bm_subcommit(logger *lg, BAT *list_bid, n[i++] = catalog_bid->batCacheid; n[i++] = catalog_nme->batCacheid; n[i++] = dcatalog->batCacheid; - assert((BUN) i <= nn); if (BATcount(dcatalog) > (BATcount(catalog_nme)/2) && catalog_bid == list_bid && catalog_nme == list_nme && lg->catalog_bid == catalog_bid) { BAT *bids, *nmes, *tids = bm_tids(catalog_bid, dcatalog), *b; @@ -1276,6 +1275,7 @@ bm_subcommit(logger *lg, BAT *list_bid, lg->catalog_bid = catalog_bid = bids; lg->catalog_nme = catalog_nme = nmes; } + assert((BUN) i <= nn); BATcommit(catalog_bid); BATcommit(catalog_nme); BATcommit(dcatalog)
MonetDB: mosaic - merge with default
Changeset: c0d174a666d5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c0d174a666d5 Added Files: monetdb5/optimizer/Tests/inline12.malC monetdb5/optimizer/Tests/inline12.stable.err monetdb5/optimizer/Tests/inline12.stable.out sql/server/rel_partition.c sql/server/rel_partition.h sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.sql sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.err sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.out sql/test/BugTracker-2016/Tests/create_table_from_complex_query.Bug-3921.sql sql/test/BugTracker-2016/Tests/create_table_from_complex_query.Bug-3921.stable.err sql/test/BugTracker-2016/Tests/create_table_from_complex_query.Bug-3921.stable.out sql/test/BugTracker-2016/Tests/projectionpath-prefix.Bug.sql sql/test/BugTracker-2016/Tests/projectionpath-prefix.Bug.stable.err sql/test/BugTracker-2016/Tests/projectionpath-prefix.Bug.stable.out sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.err sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/mapiclient/stethoscope.c gdk/gdk_atoms.c gdk/gdk_hash.h gdk/gdk_project.c geom/sql/Tests/conformance_load.stable.out java/ChangeLog java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java monetdb5/ChangeLog monetdb5/ChangeLog.Jul2015 monetdb5/mal/Tests/dynamicload.stable.err monetdb5/mal/Tests/tst903.stable.out monetdb5/mal/Tests/tst904.stable.out monetdb5/mal/Tests/tst905.stable.out monetdb5/mal/Tests/tst907.stable.out monetdb5/mal/mal_builder.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_resolve.c monetdb5/modules/atoms/uuid.c monetdb5/modules/mal/Tests/manifold.stable.out monetdb5/modules/mal/Tests/manifoldstr.stable.out monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/JPexample.stable.out monetdb5/optimizer/Tests/Mexample.stable.out monetdb5/optimizer/Tests/inline02.stable.out monetdb5/optimizer/Tests/inline03.stable.out monetdb5/optimizer/Tests/inline04.stable.out monetdb5/optimizer/Tests/inline05.stable.out monetdb5/optimizer/Tests/inline06.stable.out monetdb5/optimizer/Tests/inline07.stable.out monetdb5/optimizer/Tests/inline08.stable.out monetdb5/optimizer/Tests/inline09.stable.out monetdb5/optimizer/Tests/inline10.stable.out monetdb5/optimizer/Tests/inlineCst.stable.out monetdb5/optimizer/Tests/inlineFunction2.stable.out monetdb5/optimizer/Tests/inlineIfthen.stable.out monetdb5/optimizer/Tests/manifold2.stable.out monetdb5/optimizer/Tests/manifold2.stable.out.single monetdb5/optimizer/Tests/projectionchain.stable.out monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_generator.c monetdb5/optimizer/opt_inline.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_profiler.c monetdb5/optimizer/opt_projectionpath.c monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_remap.c sql/backends/monet5/Tests/rapi12.stable.out sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/bam/Tests/query2.5.stable.out sql/backends/monet5/vaults/bam/Tests/query2.5.stable.out.int128 sql/backends/monet5/vaults/bam/Tests/query2.6.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
MonetDB: mosaic - Merge with default
Changeset: 70750f4ae072 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=70750f4ae072 Added Files: gdk/gdk_hash.c gdk/gdk_hash.h sql/jdbc/tests/Tests/Test_Dobjects.SQL.bat sql/server/rel_rel.c sql/server/rel_rel.h sql/test/mergetables/Tests/part-elim.sql sql/test/mergetables/Tests/part-elim.stable.err sql/test/mergetables/Tests/part-elim.stable.out Removed Files: gdk/gdk_search.h sql/test/Users/Tests/util.py Modified Files: clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 configure.ag gdk/Makefile.ag gdk/gdk.h gdk/gdk_bat.c gdk/gdk_delta.c gdk/gdk_imprints.c gdk/gdk_project.c gdk/gdk_search.c gdk/gdk_storage.c java/ChangeLog java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java java/tests/Test_Dobjects.java monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single monetdb5/mal/Tests/dynamicload.malC monetdb5/mal/Tests/dynamicload.stable.err monetdb5/mal/mal_listing.c monetdb5/modules/kernel/microbenchmark.c monetdb5/modules/mal/Tests/remote03.stable.err monetdb5/modules/mal/tablet.c monetdb5/optimizer/Tests/JPexample.malC monetdb5/optimizer/Tests/JPexample.stable.out monetdb5/optimizer/Tests/projectionchain.malC monetdb5/optimizer/Tests/projectionchain.stable.out monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_projectionpath.c monetdb5/optimizer/opt_volcano.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_gencode.h sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_optimizer.h sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-explain.stable.out sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/11-explain.stable.out sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/13-explain.stable.out sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/04-explain.stable.out sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/06-explain.stable.out sql/benchmarks/tpch/Tests/06-explain.stable.out.int128 sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/07-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch
MonetDB: mosaic - Merge with default
Changeset: ecf00991af5b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ecf00991af5b Modified Files: monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/remote03.stable.err monetdb5/modules/mal/Tests/remote03.stable.out monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/manifold2.stable.out.single sql/backends/monet5/generator/Tests/joins00.sql sql/backends/monet5/generator/Tests/joins01.sql sql/backends/monet5/generator/Tests/joins01.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/10-explain.stable.out sql/benchmarks/ssbm/Tests/11-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/13-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/06-explain.stable.out sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/12-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out sql/benchmarks/tpch/Tests/15-explain.stable.out sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/18-explain.stable.out sql/benchmarks/tpch/Tests/19-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit sql/test/BugTracker-2011/Tests/bulk_rotate_xor_hash-error.Bug-2734.stable.out sql/test/BugTracker-2011/Tests/cast-crash.Bug-2678.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out sql/test/BugTracker-2011/Tests/predicate.Bug-2908.stable.out sql/test/BugTracker-2011/Tests/sqltables.Bug-2921.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out sql/test/Tests/median_stdev.sql Branch: mosaic Log Message: Merge with default diffs (truncated from 4856 to 300 lines): diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single --- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single +++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single @@ -61,16 +61,16 @@ Ready. % .explain # table_name % mal # name % clob # type -% 133 # length -function user.s4_1{autoCommit=true}():void; -X_26:void := querylog.define("explain copy into ttt from \\'/tmp/xyz\\';","default_pipe",10); -X_2 := sql.mvc(); -(X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) := sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0); -X_15 := sql.append(X_2,"sys","ttt","a",X_12); -X_19 := sql.append(X_15,"sys","ttt","b",X_13); -X_21 := sql.append(X_19,"sys","ttt","c",X_14); -X_23 := aggr.count(X_14); -sql.affectedRows(X_21,X_23,""); +% 118 # length +function user.s4_1():void; +X_24:void := querylog.define("explain copy into ttt from \\'/tmp/xyz\\';","default_pipe",10); +X_1 := sql.mvc(); +(X_11:bat[:int],X_12:bat[:int],X_13:bat[:int]) := sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0); +X_14 := sql.append(X_1,"sys","ttt","a",X_11); +X_18 := sql.append(X_14,"sys","tt
MonetDB: mosaic - merge with default
Changeset: 6dd4926090c1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6dd4926090c1 Modified Files: gdk/gdk_calc.c gdk/gdk_calc_compare.h java/ChangeLog java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java java/tests/build.xml sql/backends/monet5/rel_bin.c sql/server/rel_optimizer.c sql/server/rel_select.c tools/merovingian/daemon/connections.c tools/merovingian/daemon/connections.h tools/merovingian/daemon/merovingian.c Branch: mosaic Log Message: merge with default diffs (truncated from 824 to 300 lines): diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c --- a/gdk/gdk_calc.c +++ b/gdk/gdk_calc.c @@ -124,14 +124,16 @@ checkbats(BAT *b1, BAT *b2, const char * CANDLOOP((TYPE3 *) dst, k, TYPE3##_nil, 0, start); \ for (i = start * incr1, j = start * incr2, k = start; \ k < end; i += incr1, j += incr2, k++) {\ + register TYPE1 v1; \ + register TYPE2 v2; \ CHECKCAND((TYPE3 *) dst, k, candoff, TYPE3##_nil); \ - if (((const TYPE1 *) lft)[i] == TYPE1##_nil || \ - ((const TYPE2 *) rgt)[j] == TYPE2##_nil) { \ + v1 = ((const TYPE1 *) lft)[i]; \ + v2 = ((const TYPE2 *) rgt)[j]; \ + if (v1 == TYPE1##_nil || v2 == TYPE2##_nil) { \ nils++; \ ((TYPE3 *) dst)[k] = TYPE3##_nil; \ } else {\ - ((TYPE3 *) dst)[k] = FUNC(((const TYPE1 *) lft)[i], \ - ((const TYPE2 *) rgt)[j]); \ + ((TYPE3 *) dst)[k] = FUNC(v1, v2); \ } \ } \ CANDLOOP((TYPE3 *) dst, k, TYPE3##_nil, end, cnt); \ @@ -141,9 +143,14 @@ checkbats(BAT *b1, BAT *b2, const char * do {\ CANDLOOP((TYPE3 *) dst, k, TYPE3##_nil, 0, start); \ for (i = start * incr1, j = start * incr2, k = start; \ -k < end; i += incr1, j += incr2, k++) \ - ((TYPE3 *) dst)[k] = FUNC(((const TYPE1 *) lft)[i], \ - ((const TYPE2 *) rgt)[j]); \ +k < end; i += incr1, j += incr2, k++) {\ + register TYPE1 v1; \ + register TYPE2 v2; \ + CHECKCAND((TYPE3 *) dst, k, candoff, TYPE3##_nil); \ + v1 = ((const TYPE1 *) lft)[i]; \ + v2 = ((const TYPE2 *) rgt)[j]; \ + ((TYPE3 *) dst)[k] = FUNC(v1, v2); \ + } \ CANDLOOP((TYPE3 *) dst, k, TYPE3##_nil, end, cnt); \ } while (0) @@ -152,26 +159,27 @@ checkbats(BAT *b1, BAT *b2, const char * CANDLOOP((TYPE3 *) dst, k, TYPE3##_nil, 0, start); \ for (i = start * incr1, j = start * incr2, k = start; \ k < end; i += incr1, j += incr2, k++) {\ + register TYPE1 v1; \ + register TYPE2 v2; \ CHECKCAND((TYPE3 *) dst, k, candoff, TYPE3##_nil); \ - if (((const TYPE1 *) lft)[i] == TYPE1##_nil || \ - ((const TYPE2 *) rgt)[j] == TYPE2##_nil) { \ + v1 = ((const TYPE1 *) lft)[i]; \ + v2 = ((const TYPE2 *) rgt)[j]; \ + if (v1 == TYPE1##_nil || v2 == TYPE2##_nil) { \ nils++; \ ((TYPE3 *) dst)[k] = TYPE3##_nil; \ - } else if (CHECK(((const TYPE1 *) lft)[i], \ -((const TYPE2 *) rgt)[j])) { \ + } else if (CHECK(v1, v2)) { \ if (abort_on_error) { \ GDKerror("%s: shift operand too large in " \
MonetDB: mosaic - Merge with default
Changeset: 58f7c1e4d490 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=58f7c1e4d490 Added Files: sql/test/BugTracker-2016/Tests/All sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.sql sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.stable.err sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.stable.out sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.sql sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.stable.err sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.stable.out Modified Files: gdk/gdk_join.c monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/projectionchain.malC monetdb5/optimizer/Tests/projectionchain.stable.err monetdb5/optimizer/Tests/projectionchain.stable.out testing/Mfilter.py testing/Mtest.py.in Branch: mosaic Log Message: Merge with default diffs (truncated from 1246 to 300 lines): diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c --- a/gdk/gdk_join.c +++ b/gdk/gdk_join.c @@ -195,16 +195,14 @@ joininitresults(BAT **r1p, BAT **r2p, BU #define BINSEARCHFUNC(TYPE)\ static inline BUN \ binsearch_##TYPE(const oid *rcand, oid offset, const TYPE *rvals, \ -BUN lo, BUN hi, const void *vp, int ordering, int last) \ +BUN lo, BUN hi, TYPE v, int ordering, int last)\ { \ BUN mid;\ - TYPE v, x; \ + TYPE x; \ \ assert(ordering == 1 || ordering == -1);\ assert(lo <= hi); \ \ - v = *(const TYPE *) vp; /* value we're searching for */ \ - \ if (ordering > 0) { \ if (rcand) {\ if (last) { \ @@ -355,10 +353,10 @@ BINSEARCHFUNC(hge) BINSEARCHFUNC(flt) BINSEARCHFUNC(dbl) #if SIZEOF_OID == SIZEOF_INT -#define binsearch_oid(rcand, offset, rvals, lo, hi, vp, ordering, last) binsearch_int(rcand, offset, (const int *) rvals, lo, hi, (const int *) (vp), ordering, last) +#define binsearch_oid(rcand, offset, rvals, lo, hi, v, ordering, last) binsearch_int(rcand, offset, (const int *) rvals, lo, hi, (int) (v), ordering, last) #endif #if SIZEOF_OID == SIZEOF_LNG -#define binsearch_oid(rcand, offset, rvals, lo, hi, vp, ordering, last) binsearch_lng(rcand, offset, (const lng *) rvals, lo, hi, (const lng *) (vp), ordering, last) +#define binsearch_oid(rcand, offset, rvals, lo, hi, v, ordering, last) binsearch_lng(rcand, offset, (const lng *) rvals, lo, hi, (lng) (v), ordering, last) #endif /* Do a binary search for the first/last occurrence of v between lo and hi @@ -385,10 +383,10 @@ binsearch(const oid *rcand, oid offset, switch (type) { case TYPE_bte: return binsearch_bte(rcand, offset, (const bte *) rvals, -lo, hi, (const bte *) v, ordering, last); +lo, hi, *(const bte *) v, ordering, last); case TYPE_sht: return binsearch_sht(rcand, offset, (const sht *) rvals, -lo, hi, (const sht *) v, ordering, last); +lo, hi, *(const sht *) v, ordering, last); case TYPE_int: #if SIZEOF_WRD == SIZEOF_INT case TYPE_wrd: @@ -397,7 +395,7 @@ binsearch(const oid *rcand, oid offset, case TYPE_oid: #endif return binsearch_int(rcand, offset, (const int *) rvals, -lo, hi, (const int *) v, ordering, last); +lo, hi, *(const int *) v, ordering, last); case TYPE_lng: #if SIZEOF_WRD == SIZEOF_LNG case TYPE_wrd: @@ -406,18 +404,18 @@ binsearch(const oid *rcand, oid offset, case TYPE_oid: #endif return binsearch_lng(rcand, offset, (const lng *) rvals, -lo, hi, (const lng *) v, ordering, last); +lo, hi, *(const lng
MonetDB: mosaic - merge with default
Changeset: cd4aac446267 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cd4aac446267 Added Files: tools/merovingian/daemon/monetdbd.service.in Modified Files: MonetDB.spec buildtools/ChangeLog clients/Tests/exports.stable.out configure.ag gdk/gdk_project.c monetdb5/mal/mal_resource.c monetdb5/mal/mal_resource.h sql/backends/monet5/sql_optimizer.c tools/merovingian/daemon/Makefile.ag Branch: mosaic Log Message: merge with default diffs (177 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -754,6 +754,7 @@ systemd-tmpfiles --create %{_sysconfdir} %exclude %{_sysconfdir}/tmpfiles.d/monetdbd.conf %endif %config(noreplace) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties +%{_unitdir}/monetdbd.service %{_libdir}/monetdb5/autoload/??_sql.mal %{_libdir}/monetdb5/lib_sql.so %{_libdir}/monetdb5/*.sql @@ -891,9 +892,6 @@ developer, but if you do want to test, t %files testing-python %defattr(-,root,root) -# at least F12 doesn't produce these -# %exclude %{_bindir}/*.pyc -# %exclude %{_bindir}/*.pyo %{_bindir}/Mapprove.py %{_bindir}/Mtest.py %dir %{python_sitelib}/MonetDBtesting diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog --- a/buildtools/ChangeLog +++ b/buildtools/ChangeLog @@ -1,3 +1,7 @@ # ChangeLog file for buildtools # This file is updated with Maddlog +* Sat Jan 23 2016 Sjoerd Mullender +- Implemented a systemd configuration file for a monetdbd.service + on Fedora. + 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 @@ -1260,7 +1260,7 @@ str MALpass(Client cntxt, MalBlkPtr mb, str MALpipeline(Client c); str MALreader(Client c); void MALresourceFairness(lng usec); -int MALrunningThreads(void); +size_t MALrunningThreads(void); str MALstartDataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MANIFOLDevaluate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MANIFOLDremapMultiplex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -3145,6 +3145,7 @@ eval "Ebindir=${Ebindir}" QEbindir="`echo "$Ebindir" | sed 's///g'`" AC_SUBST(Qbindir) AC_SUBST(Xbindir) +AC_SUBST(Ebindir) AC_SUBST(QXbindir) Qlibexecdir="$libexecdir" Xlibexecdir="`$translatepath "$libexecdir"`" diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c --- a/gdk/gdk_project.c +++ b/gdk/gdk_project.c @@ -591,7 +591,7 @@ BATprojectchain(BAT **bats) GDKerror("BATprojectchain: does not match always\n"); goto bunins_failed; } - *v++ = o + offset; + *v++ = (oid) (o + offset); } } } else { diff --git a/monetdb5/mal/mal_resource.c b/monetdb5/mal/mal_resource.c --- a/monetdb5/mal/mal_resource.c +++ b/monetdb5/mal/mal_resource.c @@ -222,7 +222,7 @@ MALresourceFairness(lng usec) } // Get a hint on the parallel behavior -int +size_t MALrunningThreads(void) { return running; diff --git a/monetdb5/mal/mal_resource.h b/monetdb5/mal/mal_resource.h --- a/monetdb5/mal/mal_resource.h +++ b/monetdb5/mal/mal_resource.h @@ -22,6 +22,6 @@ mal_export int MALadmission(lng argclaim mal_export lng getMemoryClaim(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int i, int flag); mal_export void MALresourceFairness(lng usec); -mal_export int MALrunningThreads(void); +mal_export size_t MALrunningThreads(void); #endif /* _MAL_RESOURCE_H*/ diff --git a/sql/backends/monet5/sql_optimizer.c b/sql/backends/monet5/sql_optimizer.c --- a/sql/backends/monet5/sql_optimizer.c +++ b/sql/backends/monet5/sql_optimizer.c @@ -50,14 +50,14 @@ * common term optimizer, because the first bind has a side-effect. */ -static size_t SQLgetStatistics(Client cntxt, mvc *m, MalBlkPtr mb) +static lng SQLgetStatistics(Client cntxt, mvc *m, MalBlkPtr mb) { InstrPtr *old = NULL; int oldtop, i, actions = 0, size = 0; lng clk = GDKusec(); sql_trans *tr = m->session->tr; str msg; - size_t space = 0; // sum the total amount of data potentially read + lng space = 0; // sum the total amount of data potentially read old = mb->stmt; oldtop = mb->stop; @@ -148,7 +148,7 @@ static size_t SQLgetStatistics(Client cn mt_member = c->t->p->base.id; } } - //mnstr_printf(GDKerr, "#space estimate after %s.%s.%s mode %d "SZFMT"\n",sname,tname,cname, mode, space); + //mnstr_printf(GDKerr, "
MonetDB: mosaic - Merge with default
Changeset: ed670fd4dda9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed670fd4dda9 Added Files: gdk/gdk_project.c monetdb5/modules/mal/projectionpath.c monetdb5/modules/mal/projectionpath.h monetdb5/optimizer/Tests/projectionchain.malC monetdb5/optimizer/Tests/projectionchain.stable.err monetdb5/optimizer/Tests/projectionchain.stable.out monetdb5/optimizer/opt_projectionpath.c monetdb5/optimizer/opt_projectionpath.h monetdb5/optimizer/opt_volcano.c monetdb5/optimizer/opt_volcano.h sql/test/rdf/Tests/q8_v_small.reqtests sql/test/rdf/Tests/q8_v_small.sql sql/test/rdf/Tests/q8_v_small.stable.err sql/test/rdf/Tests/q8_v_small.stable.out Removed Files: monetdb5/modules/mal/joinpath.c monetdb5/modules/mal/joinpath.h monetdb5/optimizer/Tests/joinchain.malC monetdb5/optimizer/Tests/joinchain.stable.err monetdb5/optimizer/Tests/joinchain.stable.out monetdb5/optimizer/opt_joinpath.c monetdb5/optimizer/opt_joinpath.h Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.err clients/Tests/exports.stable.out clients/Tests/malcheck.stable.err common/stream/stream.c gdk/Makefile.ag gdk/gdk.h gdk/gdk_bbp.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_search.c gdk/gdk_search.h geom/monetdb5/30_geom.mal monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single monetdb5/extras/rapi/50_rapi.mal monetdb5/extras/sphinx/30_sphinx.mal monetdb5/mal/Tests/All monetdb5/mal/Tests/dataflow01.malC monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_dataflow.h monetdb5/mal/mal_linker.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_profiler.h monetdb5/mal/mal_resource.c monetdb5/mal/mal_resource.h monetdb5/mal/mal_runtime.c monetdb5/mal/mal_runtime.h monetdb5/modules/kernel/00_aggr_hge.mal monetdb5/modules/kernel/00_aggr_hge.mal.sh monetdb5/modules/kernel/aggr.mal monetdb5/modules/kernel/aggr.mal.sh monetdb5/modules/mal/01_batcalc.mal monetdb5/modules/mal/01_batcalc.mal.sh monetdb5/modules/mal/01_calc.mal monetdb5/modules/mal/Makefile.ag monetdb5/modules/mal/Tests/manifold.malC monetdb5/modules/mal/language.mal monetdb5/modules/mal/profiler.c monetdb5/modules/mal/profiler.h monetdb5/modules/mal/profiler.mal monetdb5/optimizer/Makefile.ag monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/JPexample.malC monetdb5/optimizer/Tests/JPexample.stable.out monetdb5/optimizer/Tests/dataflow.malC monetdb5/optimizer/Tests/dataflow.stable.out monetdb5/optimizer/Tests/dataflow3.malC monetdb5/optimizer/Tests/joinpath.malC monetdb5/optimizer/Tests/leftjoinpath.malC monetdb5/optimizer/Tests/tst4005.malC monetdb5/optimizer/Tests/tst4630.malC monetdb5/optimizer/opt_costModel.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_profiler.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_support.h monetdb5/optimizer/opt_wrapper.c monetdb5/optimizer/optimizer.mal monetdb5/scheduler/Tests/All sql/backends/monet5/40_sql.mal sql/backends/monet5/Tests/optimizers.sql sql/backends/monet5/Tests/optimizers.stable.err sql/backends/monet5/UDF/80_udf.mal sql/backends/monet5/generator/90_generator.mal sql/backends/monet5/gsl/73_gsl.mal sql/backends/monet5/sql.c sql/backends/monet5/sql_decimal.mal.sh sql/backends/monet5/sql_decimal_hge.mal.sh sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/vaults/70_vault.mal sql/backends/monet5/vaults/bam/85_bam.mal sql/backends/monet5/vaults/bam/85_bam.sql sql/backends/monet5/vaults/bam/bam.mal sql/backends/monet5/vaults/lidar/75_lidar.mal sql/backends/monet5/vaults/lidar/lidar.c sql/backends/monet5/vaults/lidar/lidar.h sql/backends/monet5/vaults/lidar/lidar.mal sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-
MonetDB: mosaic - Merge with default
Changeset: e1641975eaea for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e1641975eaea Modified Files: configure.ag gdk/gdk_search.c monetdb5/mal/mal_profiler.c monetdb5/modules/atoms/str.c monetdb5/modules/mal/Tests/All monetdb5/modules/mal/mal_mapi.c sql/backends/monet5/Makefile.ag sql/server/rel_psm.c sql/server/rel_select.c sql/storage/store.c testing/Mtest.py.in Branch: mosaic Log Message: Merge with default diffs (296 lines): diff --git a/gdk/gdk_search.c b/gdk/gdk_search.c --- a/gdk/gdk_search.c +++ b/gdk/gdk_search.c @@ -316,6 +316,35 @@ BATcheckhash(BAT *b) return ret; } +#ifdef PERSISTENTHASH +static void +BAThashsync(void *arg) +{ + Heap *hp = arg; + int fd; + lng t0 = GDKusec(); + + if (HEAPsave(hp, hp->filename, NULL) != GDK_SUCCEED) + return; + if ((fd = GDKfdlocate(hp->farmid, hp->filename, "rb+", NULL)) < 0) + return; + ((size_t *) hp->base)[0] |= 1 << 24; + if (write(fd, hp->base, SIZEOF_SIZE_T) < 0) + perror("write hash"); + if (!(GDKdebug & FORCEMITOMASK)) { +#if defined(NATIVE_WIN32) + _commit(fd); +#elif defined(HAVE_FDATASYNC) + fdatasync(fd); +#elif defined(HAVE_FSYNC) + fsync(fd); +#endif + } + close(fd); + ALGODEBUG fprintf(stderr, "#BAThash: persisting hash %s (" LLFMT " usec)\n", hp->filename, GDKusec() - t0); +} +#endif + /* * The prime routine for the BAT layer is to create a new hash index. * Its argument is the element type and the maximum number of BUNs be @@ -340,9 +369,6 @@ BAThash(BAT *b, BUN masksize) const char *nme = BBP_physical(b->batCacheid); const char *ext = b->batCacheid > 0 ? "thash" : "hhash"; BATiter bi = bat_iterator(b); -#ifdef PERSISTENTHASH - int fd; -#endif ALGODEBUG fprintf(stderr, "#BAThash: create hash(%s#" BUNFMT ");\n", BATgetId(b), BATcount(b)); if ((hp = GDKzalloc(sizeof(*hp))) == NULL || @@ -516,24 +542,9 @@ BAThash(BAT *b, BUN masksize) break; } #ifdef PERSISTENTHASH - if ((BBP_status(b->batCacheid) & BBPEXISTING) && - b->batInserted == b->batCount && - HEAPsave(hp, nme, ext) == GDK_SUCCEED && - (fd = GDKfdlocate(hp->farmid, nme, "rb+", ext)) >= 0) { - ALGODEBUG fprintf(stderr, "#BAThash: persisting hash %d\n", b->batCacheid); - ((size_t *) hp->base)[0] |= 1 << 24; - if (write(fd, hp->base, SIZEOF_SIZE_T) < 0) - perror("write hash"); - if (!(GDKdebug & FORCEMITOMASK)) { -#if defined(NATIVE_WIN32) - _commit(fd); -#elif defined(HAVE_FDATASYNC) - fdatasync(fd); -#elif defined(HAVE_FSYNC) - fsync(fd); -#endif - } - close(fd); + if (BBP_status(b->batCacheid) & BBPEXISTING) { + MT_Id tid; + MT_create_thread(&tid, BAThashsync, hp, MT_THR_DETACHED); } else ALGODEBUG fprintf(stderr, "#BAThash: NOT persisting hash %d\n", b->batCacheid); #endif diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c --- a/monetdb5/mal/mal_profiler.c +++ b/monetdb5/mal/mal_profiler.c @@ -951,6 +951,7 @@ static volatile ATOMIC_TYPE hbrunning; static void profilerHeartbeat(void *dummy) { int t; + const int timeout = GDKdebug & FORCEMITOMASK ? 10 : 25; (void) dummy; for (;;) { @@ -958,12 +959,12 @@ static void profilerHeartbeat(void *dumm while (ATOMIC_GET(hbdelay, mal_beatLock) == 0 || eventstream == NULL) { if (GDKexiting() || !ATOMIC_GET(hbrunning, mal_beatLock)) return; - MT_sleep_ms(25); + MT_sleep_ms(timeout); } - for (t = (int) ATOMIC_GET(hbdelay, mal_beatLock); t > 0; t -= 25) { + for (t = (int) ATOMIC_GET(hbdelay, mal_beatLock); t > 0; t -= timeout) { if (GDKexiting() || !ATOMIC_GET(hbrunning, mal_beatLock)) return; - MT_sleep_ms(t > 25 ? 25 : t); + MT_sleep_ms(t > timeout ? timeout : t); } profilerHeartbeatEvent("ping"); } diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c --- a/monetdb5/modules/atoms/str.c +++ b/monetdb5/modules/atoms/str.c @@ -1439,6 +1439,7 @@ convertCase(BAT *from, BAT *to, str *res const unsigned char *src = (const unsigned char *) s; cons
MonetDB: mosaic - merge with default
Changeset: 21de5e4e52fe for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=21de5e4e52fe Added Files: java/tests/BugDecimalRound_Bug_3561.java sql/jdbc/tests/Tests/BugDecimalRound_Bug_3561.SQL.bat sql/jdbc/tests/Tests/BugDecimalRound_Bug_3561.SQL.sh sql/jdbc/tests/Tests/BugDecimalRound_Bug_3561.stable.err sql/jdbc/tests/Tests/BugDecimalRound_Bug_3561.stable.out sql/test/pg_regress/Tests/oid.stable.err.oid32.int128 Removed Files: monetdb5/mal/Tests/tst104.malC monetdb5/mal/Tests/tst104.stable.err monetdb5/mal/Tests/tst104.stable.out monetdb5/mal/Tests/tst105.malC monetdb5/mal/Tests/tst105.stable.err monetdb5/mal/Tests/tst105.stable.out monetdb5/mal/Tests/tst105a.malC monetdb5/mal/Tests/tst105a.stable.err monetdb5/mal/Tests/tst105a.stable.out monetdb5/mal/Tests/tst106.malC monetdb5/mal/Tests/tst106.stable.err monetdb5/mal/Tests/tst106.stable.out monetdb5/mal/Tests/tst150.malC monetdb5/mal/Tests/tst150.stable.err monetdb5/mal/Tests/tst150.stable.out Modified Files: clients/R/Tests/survey.R clients/R/Tests/survey.stable.out clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out clients/mapilib/mapi.c gdk/ChangeLog gdk/gdk.h gdk/gdk_align.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_firstn.c gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_join.c gdk/gdk_private.h gdk/gdk_search.c gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_storage.h gdk/gdk_system.c gdk/gdk_unique.c gdk/gdk_utils.c gdk/gdk_utils.h java/ChangeLog java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java java/tests/Makefile.ag java/tests/build.xml monetdb5/mal/Tests/All monetdb5/mal/Tests/dynamicload.stable.err monetdb5/mal/Tests/tst102.malC monetdb5/mal/Tests/tst102.stable.err monetdb5/mal/Tests/tst115.malC monetdb5/mal/Tests/tst115.stable.err monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_authorize.c monetdb5/mal/mal_client.c monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_factory.c monetdb5/mal/mal_linker.c monetdb5/mal/mal_module.c monetdb5/mal/mal_namespace.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_private.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_recycle.c monetdb5/mal/mal_resource.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_scenario.c monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/Tests/remote03.malC monetdb5/modules/mal/Tests/remote03.stable.err monetdb5/modules/mal/mal_mapi.c sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_scenario.c sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/06-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/12-explain.stable.out.int128 sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/jdbc/tests/Tests/All sql/server/sql_mvc.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_utils.c sql/storage/bat/bat_utils.h sql/storage/sql_storage.h sql/storage/store.c sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128 sql/test/BugTracker-2011/Tests/func_iter_v
MonetDB: mosaic - Merge with default branch.
Changeset: 099c1afffab3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=099c1afffab3 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/Tests/MAL-signatures.stable.out clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/mapiclient/eventparser.c clients/mapiclient/stethoscope.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py configure.ag debian/changelog gdk/gdk_batop.c gdk/libbat.rc java/Makefile.ag java/build.properties java/pom.xml java/release.txt libversions monetdb5/mal/mal_profiler.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/UDF/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/Tests/udf-reverse.stable.out sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.out sql/benchmarks/ATIS/Tests/load.stable.out sql/benchmarks/arno/Tests/insert_ATOM.stable.out sql/benchmarks/arno/Tests/insert_BOND.stable.out sql/benchmarks/arno_flt/Tests/init.stable.out sql/benchmarks/moa/Tests/load.stable.out sql/benchmarks/wisconsin/Tests/load.stable.out sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out sql/test/Tests/decimal2.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 testing/Mtest.py.in tools/mserver/mserver5.1.in tools/mserver/mserver5.c vertoo.data Branch: mosaic Log Message: Merge with default branch. diffs (truncated from 57118 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -613,3 +613,5 @@ d1dd6e5b7a5acfe14a33070e08c776341996deb2 2ca94cddcdf52121541eff4bf706b1b7c451f511 Jul2015_11 d1dd6e5b7a5acfe14a33070e08c776341996deb2 Jul2015_SP1_release 2ca94cddcdf52121541eff4bf706b1b7c451f511 Jul2015_SP1_release +25c9f569add9c341d40920f30936890ae6ea68a8 Jul2015_13 +25c9f569add9c341d40920f30936890ae6ea68a8 Jul2015_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -91,7 +91,7 @@ Vendor: MonetDB BV Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Jul2015-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jul2015-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -970,6 +970,45 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Tue Jan 05 2016 Sjoerd Mullender - 11.21.13-20160105 +- Rebuilt. +- BZ#2014: 'null' from copy into gets wrong +- BZ#3817: opt_pushselect stuck with multi-table UDF +- BZ#3835: windows does not release ram after operations +- BZ#3836: rand() only gets evaluated once when used as an expression +- BZ#3838: Update column with or without parenthesis produce different + results +- BZ#3840: savepoints may crash the database +- BZ#3841: mclient fails with response "Challenge string is not valid" +- BZ#3842: SQL execution fails to finish and reports bogus error messages +- BZ#3845: Too many VALUES in INSERT freeze mserver5 +- BZ#3847: Wrong SQL results for a certain combination of GROUP BY / + ORDER BY / LIMIT +- BZ#3848: mserver segfault during bulk loading/updating +- BZ#3849: HUGEINT incorrect value +- BZ#3850: DEL character not escaped +- BZ#3851: expression that should evaluate to FALSE evaluates to TRUE + in SELECT query +- BZ#3852: CASE statement produces GDK error on multithreaded database: + BATproject does not match always +- BZ#3854: Complex expression with comparison evaluates incorrectly in + WHERE clause +- BZ#3855: Foreign key referencing table in a different schema - + not allowed. +- BZ#3857: Large LIMIT in SELECT may abort the query +- BZ#3861: Using window functions cause a crash +- BZ#3864: Error in bulk import for chinese character +- BZ#3871: NOT x LIKE triggers "too many nested operators" +- BZ#3872: mserver crashes under specific combination of JOIN and WHERE + conditions +- BZ#3873: mserver5: gdk_bat.c:1015: setcolprops: Assertion `x != + ((void *)0) || col->type == 0' failed. +- BZ#3879: Database crashes when querying with several UNION ALLs. +- BZ#3887: Querying "sys"."tracelog" causes assertion violatio
MonetDB: mosaic - Merge with default branch.
Changeset: 6c01118c01b6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c01118c01b6 Modified Files: HowToStart.rst Makefile.ag NT/Makefile NT/installer32/cv64-32.sh NT/installer64/cv32-64.sh NT/installer64/fixmsi.py NT/monetdb_config.h.in NT/rules.msc NT/updatecodes.py NT/wincompile.py NT/winconfig.py README bootstrap buildtools/Makefile.ag buildtools/autogen/autogen.py buildtools/autogen/autogen/am.py buildtools/autogen/autogen/codegen.py buildtools/autogen/autogen/msc.py buildtools/autogen/autogen/var.py buildtools/autogen/setup.py buildtools/conf/Maddlog buildtools/conf/Makefile.ag buildtools/conf/fixlicense.py buildtools/conf/rules.mk buildtools/conf/website.html buildtools/doc/HowToRelease.rst buildtools/doc/windowsbuild.rst clients/Makefile.ag clients/NT/Makefile.ag clients/NT/mclient.bat clients/NT/msqldump.bat clients/NT/stethoscope.bat clients/examples/C/Makefile.ag clients/examples/C/sample0.c clients/examples/C/sample1.c clients/examples/C/sample2.c clients/examples/C/sample3.c clients/examples/C/sample4.c clients/examples/C/smack00.c clients/examples/C/smack01.c clients/examples/Makefile.ag clients/examples/php/Makefile.ag clients/examples/php/sqlsample.php clients/examples/python/basics.py clients/examples/python/mclient-python2.py clients/examples/python/mclient-python3.py clients/examples/python/perf.py clients/examples/python/sqlsample.py clients/mapiclient/Makefile.ag clients/mapiclient/ReadlineTools.c clients/mapiclient/ReadlineTools.h clients/mapiclient/dotmonetdb.c clients/mapiclient/dotmonetdb.h clients/mapiclient/dump.c clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h clients/mapiclient/mclient.c clients/mapiclient/mnc.c clients/mapiclient/msqldump.c clients/mapiclient/msqldump.h clients/mapiclient/stethoscope.c clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/mapilib/Makefile.ag clients/mapilib/mapi.c clients/mapilib/mapi.h clients/mapilib/monetdb-mapi.pc.in clients/odbc/Makefile.ag clients/odbc/doc/ExcelMonetDB.html clients/odbc/doc/unixODBC.html clients/odbc/driver/Makefile.ag clients/odbc/driver/ODBCConvert.c clients/odbc/driver/ODBCDbc.c clients/odbc/driver/ODBCDbc.h clients/odbc/driver/ODBCDesc.c clients/odbc/driver/ODBCDesc.h clients/odbc/driver/ODBCEnv.c clients/odbc/driver/ODBCEnv.h clients/odbc/driver/ODBCError.c clients/odbc/driver/ODBCError.h clients/odbc/driver/ODBCGlobal.h clients/odbc/driver/ODBCStmt.c clients/odbc/driver/ODBCStmt.h clients/odbc/driver/ODBCUtil.c clients/odbc/driver/ODBCUtil.h clients/odbc/driver/SQLAllocConnect.c clients/odbc/driver/SQLAllocEnv.c clients/odbc/driver/SQLAllocHandle.c clients/odbc/driver/SQLAllocStmt.c clients/odbc/driver/SQLBindCol.c clients/odbc/driver/SQLBindParameter.c clients/odbc/driver/SQLBrowseConnect.c clients/odbc/driver/SQLBulkOperations.c clients/odbc/driver/SQLCancel.c clients/odbc/driver/SQLCloseCursor.c clients/odbc/driver/SQLColAttribute.c clients/odbc/driver/SQLColAttributes.c clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driver/SQLConnect.c clients/odbc/driver/SQLCopyDesc.c clients/odbc/driver/SQLDataSources.c clients/odbc/driver/SQLDescribeCol.c clients/odbc/driver/SQLDescribeParam.c clients/odbc/driver/SQLDisconnect.c clients/odbc/driver/SQLDriverConnect.c clients/odbc/driver/SQLDrivers.c clients/odbc/driver/SQLEndTran.c clients/odbc/driver/SQLError.c clients/odbc/driver/SQLExecDirect.c clients/odbc/driver/SQLExecute.c clients/odbc/driver/SQLExtendedFetch.c clients/odbc/driver/SQLFetch.c clients/odbc/driver/SQLFetchScroll.c clients/odbc/driver/SQLForeignKeys.c clients/odbc/driver/SQLFreeConnect.c clients/odbc/driver/SQLFreeEnv.c clients/odbc/driver/SQLFreeHandle.c clients/odbc/driver/SQLFreeStmt.c clients/odbc/driver/SQLGetConnectAttr.c clients/odbc/driver/SQLGetConnectOption.c clients/odbc/driver/SQLGetCursorName.c clients/odbc/driver/SQLGetData.c clients/odbc/driver/SQLGetDescField.c clients/odbc/driver/SQLGetDescRec.c client
MonetDB: mosaic - Merge with default branch.
Changeset: d267589bcff7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d267589bcff7 Added Files: monetdb5/mal/Tests/dataflow01.malC monetdb5/mal/Tests/dataflow03.malC monetdb5/mal/Tests/dynamicload.malC monetdb5/mal/Tests/flowchk.malC monetdb5/mal/Tests/parseErrors.malC monetdb5/mal/Tests/performanceTests/join.malC monetdb5/mal/Tests/performanceTests/tst400a.malC monetdb5/mal/Tests/performanceTests/tst400a2.malC monetdb5/mal/Tests/performanceTests/tst400b.malC monetdb5/mal/Tests/performanceTests/tst400bHuge.malC monetdb5/mal/Tests/performanceTests/tst400bHuge2.malC monetdb5/mal/Tests/performanceTests/tst400c.malC monetdb5/mal/Tests/performanceTests/tst400cHuge.malC monetdb5/mal/Tests/performanceTests/tst400cHuge2.malC monetdb5/mal/Tests/performanceTests/tst400d.malC monetdb5/mal/Tests/performanceTests/tst400e.malC monetdb5/mal/Tests/performanceTests/tst400f.malC monetdb5/mal/Tests/performanceTests/tst400h.malC monetdb5/mal/Tests/performanceTests/tst901a.malC monetdb5/mal/Tests/performanceTests/tst901b.malC monetdb5/mal/Tests/performanceTests/tst901c.malC monetdb5/mal/Tests/pithole.malC monetdb5/mal/Tests/recycle00.malC monetdb5/mal/Tests/recycle01.malC monetdb5/mal/Tests/recycle02.malC monetdb5/mal/Tests/recycle03.malC monetdb5/mal/Tests/recycle04.malC monetdb5/mal/Tests/recycle05.malC monetdb5/mal/Tests/recycle07.malC monetdb5/mal/Tests/recycle08.malC monetdb5/mal/Tests/recycle10.malC monetdb5/mal/Tests/recycle11.malC monetdb5/mal/Tests/recycle12.malC monetdb5/mal/Tests/selecttest.malC monetdb5/mal/Tests/tst000.malC monetdb5/mal/Tests/tst001.malC monetdb5/mal/Tests/tst002.malC monetdb5/mal/Tests/tst003.malC monetdb5/mal/Tests/tst004.malC monetdb5/mal/Tests/tst005.malC monetdb5/mal/Tests/tst005.stable.err monetdb5/mal/Tests/tst006.malC monetdb5/mal/Tests/tst007.malC monetdb5/mal/Tests/tst008.malC monetdb5/mal/Tests/tst009.malC monetdb5/mal/Tests/tst010.malC monetdb5/mal/Tests/tst011.malC monetdb5/mal/Tests/tst012.malC monetdb5/mal/Tests/tst013.malC monetdb5/mal/Tests/tst014.malC monetdb5/mal/Tests/tst015.malC monetdb5/mal/Tests/tst016.malC monetdb5/mal/Tests/tst018.malC monetdb5/mal/Tests/tst019.malC monetdb5/mal/Tests/tst020.malC monetdb5/mal/Tests/tst021.malC monetdb5/mal/Tests/tst022.malC monetdb5/mal/Tests/tst022.stable.err monetdb5/mal/Tests/tst022.stable.out monetdb5/mal/Tests/tst024.malC monetdb5/mal/Tests/tst025.malC monetdb5/mal/Tests/tst026.malC monetdb5/mal/Tests/tst027.malC monetdb5/mal/Tests/tst028.malC monetdb5/mal/Tests/tst029.malC monetdb5/mal/Tests/tst030.malC monetdb5/mal/Tests/tst031.malC monetdb5/mal/Tests/tst032.malC monetdb5/mal/Tests/tst033.malC monetdb5/mal/Tests/tst034.malC monetdb5/mal/Tests/tst035.malC monetdb5/mal/Tests/tst036.malC monetdb5/mal/Tests/tst037.malC monetdb5/mal/Tests/tst038.malC monetdb5/mal/Tests/tst039.malC monetdb5/mal/Tests/tst041.malC monetdb5/mal/Tests/tst042.malC monetdb5/mal/Tests/tst043.malC monetdb5/mal/Tests/tst044.malC monetdb5/mal/Tests/tst045.malC monetdb5/mal/Tests/tst046.malC monetdb5/mal/Tests/tst047.malC monetdb5/mal/Tests/tst048.malC monetdb5/mal/Tests/tst049.malC monetdb5/mal/Tests/tst050.malC monetdb5/mal/Tests/tst051.malC monetdb5/mal/Tests/tst052.malC monetdb5/mal/Tests/tst053.malC monetdb5/mal/Tests/tst054.malC monetdb5/mal/Tests/tst055.malC monetdb5/mal/Tests/tst056.malC monetdb5/mal/Tests/tst057.malC monetdb5/mal/Tests/tst058.malC monetdb5/mal/Tests/tst059.malC monetdb5/mal/Tests/tst060.malC monetdb5/mal/Tests/tst061.malC monetdb5/mal/Tests/tst070.malC monetdb5/mal/Tests/tst071.malC monetdb5/mal/Tests/tst072.malC monetdb5/mal/Tests/tst074.malC monetdb5/mal/Tests/tst075.malC monetdb5/mal/Tests/tst077.malC monetdb5/mal/Tests/tst080.malC monetdb5/mal/Tests/tst100.malC monetdb5/mal/Tests/tst1000.malC monetdb5/mal/Tests/tst1002.malC monetdb5/mal/Tests/tst1004.malC monetdb5/mal/Tests/tst101.malC monetdb5/mal/Tests/tst1012.malC monetdb5/mal/Tests/tst102.malC monetdb5/mal/Tests/tst1020.malC monetdb5/mal/Tests/tst1022.malC monetdb5/mal/Tests/tst103.malC monetdb5/mal/Tests/tst104.malC monetdb5/mal/Tests/tst105.malC m
MonetDB: mosaic - Merge with default.
Changeset: 2e358e66a862 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2e358e66a862 Added Files: monetdb5/modules/mal/Tests/mosaic_delta.malC monetdb5/modules/mal/Tests/mosaic_delta_joins.malC monetdb5/modules/mal/Tests/mosaic_delta_subselect.malC monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_dictionary.malC monetdb5/modules/mal/Tests/mosaic_dictionary_joins.malC monetdb5/modules/mal/Tests/mosaic_dictionary_subselect.malC monetdb5/modules/mal/Tests/mosaic_dictionary_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_frame.malC monetdb5/modules/mal/Tests/mosaic_frame_joins.malC monetdb5/modules/mal/Tests/mosaic_frame_subselect.malC monetdb5/modules/mal/Tests/mosaic_frame_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_linear.malC monetdb5/modules/mal/Tests/mosaic_linear_joins.malC monetdb5/modules/mal/Tests/mosaic_linear_subselect.malC monetdb5/modules/mal/Tests/mosaic_linear_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_literal.malC monetdb5/modules/mal/Tests/mosaic_literal_double.malC monetdb5/modules/mal/Tests/mosaic_literal_inplace.malC monetdb5/modules/mal/Tests/mosaic_literal_joins.malC monetdb5/modules/mal/Tests/mosaic_literal_subselect.malC monetdb5/modules/mal/Tests/mosaic_literal_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_mix.malC monetdb5/modules/mal/Tests/mosaic_mix_joins.malC monetdb5/modules/mal/Tests/mosaic_mix_subselect.malC monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_prefix.malC monetdb5/modules/mal/Tests/mosaic_prefix_joins.malC monetdb5/modules/mal/Tests/mosaic_prefix_subselect.malC monetdb5/modules/mal/Tests/mosaic_prefix_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_runlength.malC monetdb5/modules/mal/Tests/mosaic_runlength_joins.malC monetdb5/modules/mal/Tests/mosaic_runlength_subselect.malC monetdb5/modules/mal/Tests/mosaic_runlength_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_view_subselect.malC monetdb5/modules/mal/Tests/mosaic_zone.malC monetdb5/modules/mal/Tests/mosaic_zone_joins.malC monetdb5/modules/mal/Tests/mosaic_zone_subselect.malC monetdb5/modules/mal/Tests/mosaic_zone_thetasubselect.malC Removed Files: monetdb5/modules/mal/Tests/mosaic_delta.mal monetdb5/modules/mal/Tests/mosaic_delta_joins.mal monetdb5/modules/mal/Tests/mosaic_delta_subselect.mal monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_dictionary.mal monetdb5/modules/mal/Tests/mosaic_dictionary_joins.mal monetdb5/modules/mal/Tests/mosaic_dictionary_subselect.mal monetdb5/modules/mal/Tests/mosaic_dictionary_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_frame.mal monetdb5/modules/mal/Tests/mosaic_frame_joins.mal monetdb5/modules/mal/Tests/mosaic_frame_subselect.mal monetdb5/modules/mal/Tests/mosaic_frame_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_linear.mal monetdb5/modules/mal/Tests/mosaic_linear_joins.mal monetdb5/modules/mal/Tests/mosaic_linear_subselect.mal monetdb5/modules/mal/Tests/mosaic_linear_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_literal.mal monetdb5/modules/mal/Tests/mosaic_literal_double.mal monetdb5/modules/mal/Tests/mosaic_literal_inplace.mal monetdb5/modules/mal/Tests/mosaic_literal_joins.mal monetdb5/modules/mal/Tests/mosaic_literal_subselect.mal monetdb5/modules/mal/Tests/mosaic_literal_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_mix.mal monetdb5/modules/mal/Tests/mosaic_mix_joins.mal monetdb5/modules/mal/Tests/mosaic_mix_subselect.mal monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_prefix.mal monetdb5/modules/mal/Tests/mosaic_prefix_joins.mal monetdb5/modules/mal/Tests/mosaic_prefix_subselect.mal monetdb5/modules/mal/Tests/mosaic_prefix_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_runlength.mal monetdb5/modules/mal/Tests/mosaic_runlength_joins.mal monetdb5/modules/mal/Tests/mosaic_runlength_subselect.mal monetdb5/modules/mal/Tests/mosaic_runlength_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_view_subselect.mal monetdb5/modules/mal/Tests/mosaic_zone.mal monetdb5/modules/mal/Tests/mosaic_zone_joins.mal monetdb5/modules/mal/Tests/mosaic_zone_subselect.mal monetdb5/modules/mal/Tests/mosaic_zone_thetasubselect.mal Modified Files: clients/Tests/exports.stable.out monetdb5/m
MonetDB: mosaic - Merge with default
Changeset: c80772560aa0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c80772560aa0 Added Files: sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.SQL.py sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.stable.err sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.stable.out sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.timeout sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.SQL.py sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.err sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.out sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.sql Removed Files: sql/storage/restrict/Makefile.ag Modified Files: NT/monetdb_config.h.in clients/mapilib/mapi.c clients/python2/monetdb/control.py clients/python3/monetdb/control.py gdk/gdk_align.c gdk/gdk_atomic.h gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_imprints.c gdk/gdk_search.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_tm.c gdk/gdk_utils.c monetdb5/extras/rapi/rapi.c monetdb5/mal/mal_client.c monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_linker.c monetdb5/mal/mal_namespace.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_recycle.c monetdb5/mal/mal_resource.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_scenario.c monetdb5/mal/mal_session.c monetdb5/modules/kernel/alarm.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tokenizer.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_statistics.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/vaults/bam/bam_loader.c sql/backends/monet5/vaults/lidar/lidar.c sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/10-explain.stable.out sql/benchmarks/ssbm/Tests/11-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/13-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/12-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out sql/benchmarks/tpch/Tests/15-explain.stable.out sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/18-explain.stable.out sql/benchmarks/tpch/Tests/19-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit sql/common/sql_list.c sql/common/sql_types.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_planner.c sql/server/rel_select.c sql/server/rel_updates.c sql/storage/sql_catalog.c sql/storage/store.c sql/test/BugTracker-2015/Tests/All sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.err sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out sql/test/BugTracker-2015/Tests/date_comparison_incorrect_results.Bug-3834.stable.out sql/test/BugTracker-2015/Tests/update_with_without_parenthesis.Bug-3838.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select2.test.sql sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stab
MonetDB: mosaic - Merge with default
Changeset: 373aeeb182df for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=373aeeb182df Added Files: clients/ruby/Tests/All clients/ruby/Tests/gemtest.rb clients/ruby/Tests/gemtest.stable.err clients/ruby/Tests/gemtest.stable.out clients/ruby/Tests/rubytest.rb.in clients/ruby/Tests/rubytest.stable.err clients/ruby/Tests/rubytest.stable.out clients/ruby/doc/readme.txt clients/ruby/lib/example.rb clients/ruby/ruby-monetdb-sql-0.2.gemspec monetdb5/mal/Tests/tst1602.timeout monetdb5/modules/mal/Tests/bigsum.timeout monetdb5/optimizer/opt_candidates.c monetdb5/optimizer/opt_candidates.h sql/backends/monet5/Tests/rapi17.stable.err sql/backends/monet5/Tests/rapi17.stable.out sql/backends/monet5/Tests/rapi18.stable.err sql/backends/monet5/Tests/rapi18.stable.out sql/backends/monet5/Tests/rapi19.sql sql/backends/monet5/Tests/rapi19.stable.err sql/backends/monet5/Tests/rapi19.stable.out sql/backends/monet5/vaults/bam/85_bam.mal sql/backends/monet5/vaults/bam/85_bam.sql sql/backends/monet5/vaults/bam/BAMRecipe.pdf sql/backends/monet5/vaults/bam/Makefile.ag sql/backends/monet5/vaults/bam/Tests/All sql/backends/monet5/vaults/bam/Tests/bam.py sql/backends/monet5/vaults/bam/Tests/bam_export.SQL.py sql/backends/monet5/vaults/bam/Tests/bam_lib.reqtests sql/backends/monet5/vaults/bam/Tests/bam_lib.sql sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.err sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.out sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.mal sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.err sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.out sql/backends/monet5/vaults/bam/Tests/bam_loader_file.SQL.py sql/backends/monet5/vaults/bam/Tests/bam_loader_file.stable.err sql/backends/monet5/vaults/bam/Tests/bam_loader_file.stable.out sql/backends/monet5/vaults/bam/Tests/bam_loader_files.SQL.py sql/backends/monet5/vaults/bam/Tests/bam_loader_files.stable.err sql/backends/monet5/vaults/bam/Tests/bam_loader_files.stable.out sql/backends/monet5/vaults/bam/Tests/bam_loader_repos.SQL.py sql/backends/monet5/vaults/bam/Tests/bam_loader_repos.stable.err sql/backends/monet5/vaults/bam/Tests/bam_loader_repos.stable.out sql/backends/monet5/vaults/bam/Tests/check_files.reqtests sql/backends/monet5/vaults/bam/Tests/check_files.sql sql/backends/monet5/vaults/bam/Tests/check_files.stable.err sql/backends/monet5/vaults/bam/Tests/check_files.stable.out sql/backends/monet5/vaults/bam/Tests/check_files_exact.sql sql/backends/monet5/vaults/bam/Tests/check_files_exact.stable.err sql/backends/monet5/vaults/bam/Tests/check_files_exact.stable.out sql/backends/monet5/vaults/bam/Tests/coverage_usecase.reqtests sql/backends/monet5/vaults/bam/Tests/coverage_usecase.sql sql/backends/monet5/vaults/bam/Tests/drop_last_files.SQL.py sql/backends/monet5/vaults/bam/Tests/drop_last_files.stable.err sql/backends/monet5/vaults/bam/Tests/drop_last_files.stable.out sql/backends/monet5/vaults/bam/Tests/files/file1.bam sql/backends/monet5/vaults/bam/Tests/files/file2.sam sql/backends/monet5/vaults/bam/Tests/files/queryname/file1.bam sql/backends/monet5/vaults/bam/Tests/files/queryname/file2.sam sql/backends/monet5/vaults/bam/Tests/mergetable.reqtests sql/backends/monet5/vaults/bam/Tests/mergetable.sql sql/backends/monet5/vaults/bam/Tests/mergetable.stable.err sql/backends/monet5/vaults/bam/Tests/mergetable.stable.out sql/backends/monet5/vaults/bam/Tests/query1.1.reqtests sql/backends/monet5/vaults/bam/Tests/query1.1.sql sql/backends/monet5/vaults/bam/Tests/query1.1.stable.err sql/backends/monet5/vaults/bam/Tests/query1.1.stable.out sql/backends/monet5/vaults/bam/Tests/query1.2.reqtests sql/backends/monet5/vaults/bam/Tests/query1.2.sql sql/backends/monet5/vaults/bam/Tests/query1.2.stable.err sql/backends/monet5/vaults/bam/Tests/query1.2.stable.out sql/backends/monet5/vaults/bam/Tests/query1.3.reqtests sql/backends/monet5/vaults/bam/Tests/query1.3.sql sql/backends/monet5/vaults/bam/Tests/query1.3.stable.err sql/backends/monet5/vaults/bam/Tests/query1.3.stable.out sql/backends/monet5/vaults/bam/Tests/query1.4.reqtests sql/backends/monet5/vaults/bam/Tests/query1.4.sql sql/backends/monet5/vaults/bam/Tests/query1.4.stable.err sql/backends/monet5/vaults/bam/Tests/query1.4.stable.out sql/backends/monet5/vaults/bam/Tests/query1.5.reqtests sql/backends/monet5/vaults/bam/Tests/query1
MonetDB: mosaic - merge with default
Changeset: c9b14462db89 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c9b14462db89 Added Files: sql/backends/monet5/Tests/rapi18.sql sql/test/BugTracker-2012/Tests/huge_insert.Bug-2803.stable.err sql/test/BugTracker-2012/Tests/huge_insert.Bug-2803.stable.out sql/test/BugTracker-2012/Tests/huge_table_update.Bug-2803.stable.err sql/test/BugTracker-2012/Tests/huge_table_update.Bug-2803.stable.out sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.sql sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.err sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.out sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.out.int128 sql/test/BugTracker-2015/Tests/batting.csv.gz sql/test/BugTracker-2015/Tests/copy_into.Bug-3813.sql.in sql/test/BugTracker-2015/Tests/copy_into.Bug-3813.stable.err sql/test/BugTracker-2015/Tests/copy_into.Bug-3813.stable.out sql/test/BugTracker-2015/Tests/large_join.Bug-3809.sql sql/test/BugTracker-2015/Tests/large_join.Bug-3809.stable.err sql/test/BugTracker-2015/Tests/large_join.Bug-3809.stable.out sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.sql sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.stable.err sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.stable.out sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out sql/test/BugTracker-2015/Tests/select-tilde-arg.Bug-3814.sql sql/test/BugTracker-2015/Tests/select-tilde-arg.Bug-3814.stable.err sql/test/BugTracker-2015/Tests/select-tilde-arg.Bug-3814.stable.out sql/test/mergetables/Tests/singlekeyconstraint.stable.err sql/test/mergetables/Tests/singlekeyconstraint.stable.out sql/test/pg_regress/Tests/float8.stable.err.int128 Removed Files: gdk/gdk_setop.c sql/test/BugTracker-2015/Tests/schemadiff.SQL.py Modified Files: NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj buildtools/doc/windowsbuild.rst clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out gdk/ChangeLog gdk/Makefile.ag gdk/gdk.h gdk/gdk_batop.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_private.h gdk/gdk_ssort_impl.h gdk/gdk_storage.c gdk/gdk_utils.c gdk/gdk_utils.h monetdb5/mal/Tests/tst007.mal monetdb5/mal/Tests/tst007.stable.out monetdb5/mal/mal_authorize.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_function.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resolve.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_type.c monetdb5/mal/mal_type.h monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mtime.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/bat5.h monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/batstr.c monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/calc.c monetdb5/modules/mal/inspect.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c monetdb5/optimizer/opt_multiplex.c sql/backends/monet5/Tests/All sql/backends/monet5/sql.c sql/backends/monet5/vaults/fits.c sql/backends/monet5/vaults/netcdf.c sql/server/rel_optimizer.c sql/server/rel_select.c sql/server/sql_parser.y sql/test/BugTracker-2011/Tests/All sql/test/BugTracker-2012/Tests/All sql/test/BugTracker-2012/Tests/huge_insert.Bug-2803.sql sql/test/BugTracker-2012/Tests/huge_table_update.Bug-2803.sql sql/test/BugTracker-2014/Tests/All sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.sql sql/test/BugTracker-2015/Tests/All sql/test/BugTracker-2015/Tests/sessions_crash.Bug-3759.stable.err sql/test/BugTracker-2015/Tests/sessions_crash.Bug-3759.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/Tests/All sql/test/Tests/alastair_udf_mergetable_bug.py
MonetDB: mosaic - Merge with default
Changeset: 932b8b24a155 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=932b8b24a155 Added Files: java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java java/src/main/java/nl/cwi/monetdb/client/JdbcClient.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetSavepoint.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetWrapper.java java/src/main/java/nl/cwi/monetdb/jdbc/types/INET.java java/src/main/java/nl/cwi/monetdb/jdbc/types/URL.java java/src/main/java/nl/cwi/monetdb/mcl/MCLException.java java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java java/src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParseException.java java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java java/src/main/java/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java java/src/main/java/nl/cwi/monetdb/merovingian/Control.java java/src/main/java/nl/cwi/monetdb/merovingian/MerovingianException.java java/src/main/java/nl/cwi/monetdb/merovingian/SabaothDB.java java/src/main/java/nl/cwi/monetdb/util/CmdLineOpts.java java/src/main/java/nl/cwi/monetdb/util/Exporter.java java/src/main/java/nl/cwi/monetdb/util/Extract.java java/src/main/java/nl/cwi/monetdb/util/OptionsException.java java/src/main/java/nl/cwi/monetdb/util/SQLExporter.java java/src/main/java/nl/cwi/monetdb/util/SQLRestore.java java/src/main/java/nl/cwi/monetdb/util/XMLExporter.java sql/backends/monet5/Tests/rapi16.sql sql/backends/monet5/Tests/rapi16.stable.err sql/backends/monet5/Tests/rapi16.stable.out sql/backends/monet5/Tests/rapi17.sql sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out.int128 sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.sql sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.err sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.out sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out.single sql/test/Users/Tests/copyinto.SQL.py sql/test/copy/Tests/incorrect_columns.sql sql/test/copy/Tests/incorrect_columns.stable.err sql/test/copy/Tests/incorrect_columns.stable.out sql/test/pg_regress/Tests/loadwisconsin.timeout sql/test/pg_regress/Tests/oid.stable.err.Windows.oid32 sql/test/testdb-upgrade-chain-hge/Tests/All sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py sql/test/testdb-upgrade-chain-hge/Tests/dump.reqtests sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.err sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out sql/test/testdb-upgrade-chain-hge/Tests/dump.timeout sql/test/testdb-upgrade-chain-hge/Tests/package.py sql/test/testdb-upgrade-chain-hge/Tests/package.reqtests sql/test/testdb-upgrade-chain-hge/Tests/package.stable.err sql/test/testdb-upgrade-chain-hge/Tests/package.stable.out sql/test/testdb-upgrade-chain-hge/Tests/unpackage.py sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.err sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.out sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py sql/test/testdb-upgrade-chain-hge/Tests/upgrade.reqtests sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.err sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out sql/test/testdb-upgrade-hge/Tests/All sql/test/testdb-upgrade-hge/Tests/dump.SQL.py sql/test/testdb-upgrade-hge/Tests/dump.reqtests sql/test/testdb-upgrade-hge/Tests/dump.stable.err sql/test/testdb-upgrade-hge/Tests/dump.stable.out sql/test/testdb-upgrade-hge/Tests/dump.timeout sql/test/testdb-upgrade-hge/Tests/unpackage.py sql/test/testdb-upgrade-hge/Tests/unpackage.stable.err sql/test/testdb-upgrade-hge/Tests/unpackage.stable.out sql/test/testdb-upgrade-hge/Tests/upgrade.SQL.py sql/test/testdb-upgrade-hge/Tests/upgrade.reqtest
MonetDB: mosaic - Merge with default.
Changeset: 6fce06681d08 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6fce06681d08 Added Files: clients/R/Tests/testrandom.R clients/R/Tests/testrandom.reqtests clients/R/Tests/testrandom.stable.err clients/R/Tests/testrandom.stable.out debian/libmonetdb-stream7.install debian/libmonetdb12.install sql/backends/monet5/sql_rank.c sql/backends/monet5/sql_rank.h sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.sql sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.err sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out sql/test/BugTracker-2015/Tests/sum_interval.Bug-3785.sql sql/test/BugTracker-2015/Tests/sum_interval.Bug-3785.stable.err sql/test/BugTracker-2015/Tests/sum_interval.Bug-3785.stable.out sql/test/pg_regress/Tests/aggregates.reqtests sql/test/pg_regress/Tests/alter_table.reqtests sql/test/pg_regress/Tests/create_index.reqtests sql/test/pg_regress/Tests/create_misc.reqtests sql/test/pg_regress/Tests/create_table.reqtests sql/test/pg_regress/Tests/create_view.reqtests sql/test/pg_regress/Tests/drop.reqtests sql/test/pg_regress/Tests/join.reqtests sql/test/pg_regress/Tests/limit.reqtests sql/test/pg_regress/Tests/plpgsql.reqtests sql/test/pg_regress/Tests/portals.reqtests sql/test/pg_regress/Tests/portals_p2.reqtests sql/test/pg_regress/Tests/prepare.reqtests sql/test/pg_regress/Tests/random.reqtests sql/test/pg_regress/Tests/select.reqtests sql/test/pg_regress/Tests/select_distinct.reqtests sql/test/pg_regress/Tests/select_into.reqtests sql/test/pg_regress/Tests/select_views.reqtests sql/test/pg_regress/Tests/stats.reqtests sql/test/pg_regress/Tests/subselect.reqtests sql/test/pg_regress/Tests/transactions.reqtests Removed Files: buildtools/ChangeLog.Oct2014 clients/ChangeLog.Oct2014 clients/mapilib/ChangeLog.Oct2014 clients/python2/ChangeLog.Oct2014 clients/python3/ChangeLog.Oct2014 common/stream/ChangeLog.Oct2014 debian/libmonetdb-stream6.install debian/libmonetdb11.install gdk/ChangeLog.Oct2014 geom/ChangeLog.Oct2014 java/ChangeLog.Oct2014 monetdb5/ChangeLog.Oct2014 sql/ChangeLog.Oct2014 testing/ChangeLog.Oct2014 tools/merovingian/ChangeLog.Oct2014 Modified Files: .hgignore .hgtags MacOSX/post-install.sh 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.Jul2015 clients/ChangeLog-Archive clients/ChangeLog.Jul2015 clients/R/MonetDB.R/NAMESPACE clients/R/MonetDB.R/NEWS clients/R/MonetDB.R/R/dbi.R clients/R/MonetDB.R/man/monetdb.read.csv.Rd clients/R/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/ReadlineTools.c clients/mapiclient/stethoscope.c clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/mapilib/mapi.rc clients/odbc/driver/SQLTables.c clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py configure.ag debian/changelog debian/control gdk/ChangeLog gdk/ChangeLog-Archive gdk/ChangeLog.Jul2015 gdk/gdk.h gdk/gdk_align.c gdk/gdk_batop.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_private.h gdk/gdk_select.c gdk/gdk_setop.c gdk/libbat.rc java/ChangeLog-Archive java/ChangeLog.Jul2015 java/Makefile.ag java/build.properties java/pom.xml java/release.txt java/src/nl/cwi/monetdb/jdbc/MonetConnection.java java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java libversions monetdb5/ChangeLog monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Jul2015 monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_parser.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/modules/mal/mal_mapi.c
MonetDB: mosaic - Merge with default
Changeset: 3b13388bed57 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3b13388bed57 Modified Files: clients/mapiclient/tachograph.c Branch: mosaic Log Message: Merge with default diffs (21 lines): diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c --- a/clients/mapiclient/tachograph.c +++ b/clients/mapiclient/tachograph.c @@ -713,7 +713,7 @@ update(EventRecord *ev) if( *(s+1) == '\\' ) s++; default: fputc((int) *s, tachojson); } - fprintf(tachojson,"\",\n"); + fprintf(tachojson,"\"\n"); // collect all input producing PCs fprintf(tachojson,"\"prereq\":["); @@ -774,7 +774,7 @@ update(EventRecord *ev) } fprintf(tachojson,"\",\n"); - fprintf(tachojson,"},\n"); + fprintf(tachojson,"}\n"); fflush(tachojson); events[ev->pc].state= FINISHED; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mosaic - Merge with default
Changeset: af89dd99fe60 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af89dd99fe60 Modified Files: clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h Branch: mosaic Log Message: Merge with default diffs (93 lines): diff --git a/clients/mapiclient/eventparser.c b/clients/mapiclient/eventparser.c --- a/clients/mapiclient/eventparser.c +++ b/clients/mapiclient/eventparser.c @@ -6,7 +6,7 @@ * Copyright 2008-2015 MonetDB B.V. */ -/* (c) M Kersten, S Manegold */ +/* (c) M Kersten */ #include "eventparser.h" @@ -212,7 +212,7 @@ parseArguments(char *call, int m) int eventparser(char *row, EventRecord *ev) { - char *c, *cc, *v =0; + char *c, *cc, *v =0,*w; struct tm stm; malargc = 0; @@ -340,8 +340,8 @@ eventparser(char *row, EventRecord *ev) if (*c == 0) return -1; *c = 0; - ev->numa= strdup(numa); - if( ev->num == NULL){ + ev->numa = strdup(numa); + if( ev->numa == NULL){ fprintf(stderr,"Could not allocate numa memory\n"); exit(-1); } @@ -394,13 +394,6 @@ eventparser(char *row, EventRecord *ev) exit(-1); } c= ev->fcn; - if( ev->state == MDB_SYSTEM){ - monetdb_characteristics = strdup(ev->stmt); - if( ev->stmt == NULL){ - fprintf(stderr,"Could not allocate monetdb_characteristics memory\n"); - exit(-1); - } - } else if( *c != '[') { v=c; @@ -433,14 +426,25 @@ eventparser(char *row, EventRecord *ev) if( v) parseArguments(v+3,1); } - if (ev->stmt && (v=strstr(ev->stmt, ",\t]"))){ - *v=','; - *(v+1) = 0; - } else - if (ev->stmt && (v=strstr(ev->stmt, "\"\t]"))) - *v = 0; - else - if (ev->stmt && (v=strstr(ev->stmt, "\t]"))) - *v = 0; + // remove some superflous elements + w = strrchr(ev->stmt, (int) ']'); + if(w && *w == ev->stmt[strlen(ev->stmt)-1]) + *w = 0; + w = strrchr(ev->stmt, (int) '\t'); + if(w && *w == ev->stmt[strlen(ev->stmt)-1]) + *w = 0; + w = strrchr(ev->stmt, (int) ','); + if(w && *w == ev->stmt[strlen(ev->stmt)-1]) + *w = 0; + w = strrchr(ev->stmt, (int) '"'); + if(w && *w == ev->stmt[strlen(ev->stmt)-1]) + *w = 0; + if( ev->state == MDB_SYSTEM){ + monetdb_characteristics = strdup(ev->stmt); + if( monetdb_characteristics == NULL){ + fprintf(stderr,"Could not allocate monetdb_characteristics memory\n"); + exit(-1); + } + } return 0; } diff --git a/clients/mapiclient/eventparser.h b/clients/mapiclient/eventparser.h --- a/clients/mapiclient/eventparser.h +++ b/clients/mapiclient/eventparser.h @@ -6,7 +6,7 @@ * Copyright 2008-2015 MonetDB B.V. */ -/* (c) M Kersten, S Manegold +/* (c) M Kersten * The easiest calling method is something like: * tomograph -d demo --atlast=10 * which connects to the demo database server and ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mosaic - merge with default
Changeset: 100915017e5f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=100915017e5f Added Files: sql/test/BugTracker-2015/Tests/apply_merge_distinct.Bug-3760.sql sql/test/BugTracker-2015/Tests/apply_merge_distinct.Bug-3760.stable.err sql/test/BugTracker-2015/Tests/apply_merge_distinct.Bug-3760.stable.out sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.sql sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.stable.err sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.stable.out sql/test/BugTracker-2015/Tests/cast_on_groupby_col_crash.Bug-3769.sql sql/test/BugTracker-2015/Tests/cast_on_groupby_col_crash.Bug-3769.stable.err sql/test/BugTracker-2015/Tests/cast_on_groupby_col_crash.Bug-3769.stable.out sql/test/BugTracker-2015/Tests/sessions_crash.Bug-3759.sql sql/test/BugTracker-2015/Tests/sessions_crash.Bug-3759.stable.err sql/test/BugTracker-2015/Tests/sessions_crash.Bug-3759.stable.out sql/test/BugTracker-2015/Tests/set_default_role.Bug-3364.sql sql/test/BugTracker-2015/Tests/set_default_role.Bug-3364.stable.err sql/test/BugTracker-2015/Tests/set_default_role.Bug-3364.stable.out sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.sql sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.err sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out Modified Files: clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c debian/changelog gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_bbp.c gdk/gdk_logger.c gdk/gdk_select.c monetdb5/mal/mal_interpreter.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/mal_io.c sql/include/sql_relation.h sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/sql_privileges.c sql/test/BugDay_2005-11-09_2.9.3/Tests/grant_public.SF-1114580.stable.err sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.stable.out.int128 sql/test/BugTracker-2012/Tests/scalar_subquery_with_alias.Bug-3093.stable.out sql/test/BugTracker-2015/Tests/All sql/test/BugTracker-2015/Tests/assertHead.Bug-3706.stable.out sql/test/Users/Tests/test_privs2_p2.stable.err sql/test/remote/Tests/ssbm.SQL.py Branch: mosaic Log Message: merge with default diffs (truncated from 5063 to 300 lines): diff --git a/clients/mapiclient/eventparser.c b/clients/mapiclient/eventparser.c --- a/clients/mapiclient/eventparser.c +++ b/clients/mapiclient/eventparser.c @@ -50,29 +50,31 @@ clearArguments(void) } char * -stripQuotes(char *currentquery) -{ char *q, *c, *qry; - q = qry = (char *) malloc(strlen(currentquery) * 2); - if( q == NULL){ - fprintf(stderr,"Could not allocate query buffer of size "SZFMT"\n", strlen(currentquery) * 2); - exit(-1); - } - for (c= currentquery; *c; ){ - if ( strncmp(c,"t",3) == 0){ - *q++ = '\t'; - c+=3; - } else - if ( strncmp(c,"n",3) == 0){ - *q++ = '\n'; - c+=3; - } else if ( strncmp(c,"\\\"",2) == 0){ - *q++= '"'; - c+=2; - } else if ( strncmp(c,"",2) == 0){ - c+= 2; - } else *q++ = *c++; - } - *q =0; +stripQuotes(const char *currentquery) +{ + const char *c; + char *q, *qry; + q = qry = (char *) malloc(strlen(currentquery) * 2); + if( q == NULL){ + fprintf(stderr,"Could not allocate query buffer of size "SZFMT"\n", strlen(currentquery) * 2); + exit(-1); + } + for (c= currentquery; *c; ){ + if ( strncmp(c,"t",3) == 0){ + *q++ = '\t'; + c+=3; + } else + if ( strncmp(c,"n",3) == 0){ + *q++ = '\n'; + c+=3; + } else if ( strncmp(c,"\\\"",2) == 0){ + *q++= '"'; + c+=2; + } else if ( strncmp(c,"",2) == 0){ + c+= 2; + } else *q++ = *c++
MonetDB: mosaic - Merge with default
Changeset: 90d8b759fbd8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=90d8b759fbd8 Added Files: common/utils/mprompt.h common/utils/prompt.c Removed Files: clients/mapiclient/mprompt.h clients/mapiclient/prompt.c Modified Files: clients/mapiclient/Makefile.ag clients/mapiclient/eventparser.c clients/mapiclient/tachograph.c clients/python2/monetdb/mapi.py clients/python3/monetdb/mapi.py common/utils/Makefile.ag monetdb5/mal/mal_profiler.c sql/test/BugTracker-2013/Tests/All tools/mserver/mserver5.c Branch: mosaic Log Message: Merge with default diffs (272 lines): diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag --- a/clients/mapiclient/Makefile.ag +++ b/clients/mapiclient/Makefile.ag @@ -9,21 +9,23 @@ INCLUDES = ../mapilib ../../common/optio lib_mcutil = { NOINST - SOURCES = dump.c prompt.c dotmonetdb.c eventparser.c eventparser.h + SOURCES = dump.c dotmonetdb.c dotmonetdb.h eventparser.c eventparser.h } bin_mclient = { SOURCES = mclient.c ReadlineTools.c ReadlineTools.h LIBS = libmcutil ../mapilib/libmapi \ ../../common/stream/libstream \ + ../../common/utils/libmutils \ $(READLINE_LIBS) \ $(curl_LIBS) $(LTLIBICONV) $(PTHREAD_LIBS) $(MATH_LIBS) $(SOCKET_LIBS) } bin_msqldump = { - SOURCES = msqldump.c + SOURCES = msqldump.c msqldump.h LIBS = libmcutil ../mapilib/libmapi \ ../../common/stream/libstream \ + ../../common/utils/libmutils \ $(curl_LIBS) } @@ -31,6 +33,7 @@ bin_stethoscope = { SOURCES = stethoscope.c LIBS = libmcutil ../mapilib/libmapi \ ../../common/stream/libstream \ + ../../common/utils/libmutils \ $(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(SOCKET_LIBS) } @@ -38,6 +41,7 @@ bin_tachograph = { SOURCES = tachograph.c LIBS = libmcutil ../mapilib/libmapi \ ../../common/stream/libstream \ + ../../common/utils/libmutils \ $(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(SOCKET_LIBS) } @@ -45,6 +49,7 @@ bin_tomograph = { SOURCES = tomograph.c LIBS = libmcutil ../mapilib/libmapi \ ../../common/stream/libstream \ + ../../common/utils/libmutils \ $(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(SOCKET_LIBS) } @@ -59,6 +64,6 @@ bin_tomograph = { man_MANS = mclient.1 msqldump.1 -EXTRA_DIST = msqldump.h mprompt.h dotmonetdb.h $(man_MANS) +EXTRA_DIST = $(man_MANS) EXTRA_DIST_DIR = Tests diff --git a/clients/mapiclient/eventparser.c b/clients/mapiclient/eventparser.c --- a/clients/mapiclient/eventparser.c +++ b/clients/mapiclient/eventparser.c @@ -429,7 +429,7 @@ eventparser(char *row, EventRecord *ev) if( v) parseArguments(v+3,1); } - if (ev->stmt && (v=strstr(ev->stmt, ";\",\t"))) + if (ev->stmt && (v=strstr(ev->stmt, "\t]"))) *v = 0; return 0; } diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c --- a/clients/mapiclient/tachograph.c +++ b/clients/mapiclient/tachograph.c @@ -539,11 +539,23 @@ initFiles(void) static void progressBarInit(char *qry) { + char *s; fprintf(tachojson,"{ \"tachograph\":0.1,\n"); fprintf(tachojson," \"system\":%s,\n",monetdb_characteristics); fprintf(tachojson," \"qid\":\"%s\",\n",currentfunction?currentfunction:""); - fprintf(tachojson," \"tag\":\"%d\",\n",currenttag); - fprintf(tachojson," \"query\":\"%s\",\n",qry); + fprintf(tachojson," \"tag\":%d,\n",currenttag); + + fprintf(tachojson," \"query\":\""); + for(s = qry; *s; s++) + switch(*s){ + case '\n': fputs("\\n", tachojson); break; + case '\r': fputs("\\r", tachojson); break; + case '\t': fputs("\\t", tachojson); break; + case '\b': fputs("\\b", tachojson); break; + default: fputc((int) *s, tachojson); + } + fprintf(tachojson,"\",\n"); + fprintf(tachojson," \"started\": "LLFMT",\n",starttime); fprintf(tachojson," \"duration\":"LLFMT",\n",duration); fprintf(tachojson," \"instructions\":%d\n",malsize); @@ -556,7 +568,7 @@ update(EventRecord *ev) { int progress=0; int i,j; - char *v; + char *v, *s; int uid = 0,qid = 0; char line[BUFSIZ]; char prereq[BUFSIZ]={0}; @@ -685,7 +697,25 @@ update(EventRecord *ev) fprintf(tachojson,"\"status\": \"start\",\n"); fprintf(tachojson,"\"estimate\": "LLFMT",\n",ev->ticks); fprintf(tachojson,"\"stmt\": \"%s\",\n",ev->stmt); - fprintf(tachojson,"\"beautystmt\": \"%s\",\n",line); + + fprintf(tachojs
MonetDB: mosaic - Merge with default
Changeset: 88851281fb92 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88851281fb92 Added Files: sql/test/BugTracker-2015/Tests/schemadiff.SQL.py Removed Files: clients/mapiclient/mapisplit-dummy.c clients/mapiclient/profiler-dummy.c Modified Files: MacOSX/MonetDB.pkgproj MonetDB.spec clients/Makefile.ag clients/R/Tests/deps-test.timeout clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/stethoscope.c clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/odbc/driver/Makefile.ag clients/python3/ChangeLog.Jul2015 debian/control gdk/gdk_heap.c gdk/gdk_private.h gdk/gdk_storage.c gdk/gdk_utils.c monetdb5/optimizer/opt_mergetable.c sql/ChangeLog.Jul2015 sql/backends/monet5/sql_upgrades.c sql/scripts/17_temporal.sql sql/scripts/75_storagemodel.sql sql/scripts/80_statistics.sql sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out sql/test/Dependencies/Tests/Dependencies.stable.err sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 sql/test/mosaic/Tests/compressionRLE.stable.out sql/test/remote/Tests/ssbm.SQL.py sql/test/remote/Tests/ssbm.stable.out sql/test/remote/Tests/ssbm.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/dump.stable.out sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/dump.stable.out sql/test/testdb-upgrade/Tests/dump.stable.out.Windows sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: mosaic Log Message: Merge with default diffs (truncated from 2792 to 300 lines): diff --git a/MacOSX/MonetDB.pkgproj b/MacOSX/MonetDB.pkgproj --- a/MacOSX/MonetDB.pkgproj +++ b/MacOSX/MonetDB.pkgproj @@ -504,7 +504,7 @@ CONCLUSION_ACTION 0 IDENTIFIER - com.monetdbsolutions.pkg.monetdb + org.monetdb.pkg.monetdb NAME MonetDB OVERWRITE_PERMISSIONS @@ -815,13 +815,6 @@ PATH_TYPE 1 - CERTIFICATE - - NAME - Developer ID Installer: MonetDB Solutions B.V. (YEJLE7L8A4) - PATH - /Users/sjoerd/Library/Keychains/login.keychain - EXCLUDED_FILES @@ -991,7 +984,7 @@ NAME - MonetDB + MonetDB-unsigned TYPE diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -136,9 +136,9 @@ BuildRequires: R-core-devel %endif %if (0%{?fedora} >= 22) -Recommends: %{name}-SQL-server5 -Recommends: MonetDB5-server -Suggests: %{name}-client +Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release} +Recommends: MonetDB5-server%{?_isa} = %{version}-%{release} +Suggests: %{name}-client%{?_isa} = %{version}-%{release} %endif # need to define python_sitelib on RHEL 5 and older @@ -233,7 +233,7 @@ library. Summary: MonetDB - Monet Database Management System Client Programs Group: Applications/Databases %if (0%{?fedora} >= 22) -Recommends: %{name}-SQL-server5 +Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{rel
MonetDB: mosaic - Merge with default
Changeset: 98bbebd086c6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98bbebd086c6 Added Files: MacOSX/MonetDB logo.png MacOSX/MonetDB.pkgproj MacOSX/post-install.sh MacOSX/readme.rtf MacOSX/summary.rtf Modified Files: .hgignore testing/process.py Branch: mosaic Log Message: Merge with default diffs (truncated from 1285 to 300 lines): diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -92,6 +92,10 @@ NT/testing NT/tools NT/unistd.h +# package building on Mac OS X +MacOSX/build +MacOSX/usr + syntax: regexp ^java/build$ syntax: regexp diff --git a/MacOSX/MonetDB logo.png b/MacOSX/MonetDB logo.png new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4e47a2fb3e3e3f5c306ebc0a48214905c8e8d0ee GIT binary patch literal 10997 zc${^5Wl&s8*EJF#c<|r^hv3fOK_|Go49?)g;2MIvy9R>0yAvFO6FkA)-M-|J@40pB zzNe~BckjJcukL+zcby*{s-z%|jzWY20|SE&l#x*RUDy3C3a=4=zeD>3<$qVNEX3r+ zU|_1FQ6E7Fzx&7zGTKfsFsL|x3M@=o#@pW*8Y?v|sFu7Oz{K8`1!QV(Y{ued>j3lT z5p)CmZrYkbK@@JbHg-+`HzCS@AppPIf6T0u6#s%it%WGHxyY?Q(% z6ciMK5L0u2iiFgE=)ZeHl$KDa1Avv))zy{7m6OFDV!_JJ&(F`w#=*+L!TcM+?Bs3- z1-UWXIZ^$4kpGS&Vdi84v2uV~+1pY4>4S{zouNXMl>fo}`}wyJ)XMySN_I~FS=R3b zvi|X~va_(U{u9m2&FcT4{qg*tG*grRPjYaE*!*ivrY5XrHfFYFc2K9^JobO&{SMqe ztGR(3{w*f_KbGL1nFCbJoa}9!|Aau@&I&5bA;|hq=D)MV?QI<(W=>AO{leV;q5ReM zcf8jB#uMiKuf|`EeeT3j`sgX@i$nf(dSr_5(u%(IQV$DO7GwpeKqbzDB<44APHW_n3;2|+|0dr?z=dzEiILO zdUZcqxU;J3ystJ}yjBjVUuKNOujl$cB`OQgj9!*P#P;62MyHr45%JuG$BF>s2;g{#S z5f5HHOzZt_ueD#I9|kt%+!aQ{kk0XQ^qb46U!v-dX6n=7i!yJIkRZhjA?9k?i$GWf9PbiiK2=1y_IrU8F{8^Gpn-BN=E&irt$}ZNf#oLk^Z{Ajzk8(>{vPvfIHbV_V|#OC?(YICn1YS zp zH=p=c)b%IWt~pRQJ56>zJKiGpoG83|X=ZEu*^{8?am)w!j!A&$y2mM_1TzlZJ?Hr= zMF8U&ZjO#9AZh)XQI(+*64@B1&su+(_AK9Ijo6_R4>G^w zL;9`H1Z?`C=~pi9GXTGj^zq%d%_+Fclp@DB?^bxkW633Rvw_T49a}0?593;T2iLF_ zg&`+mDlQ^7nDBKLsVMH^EZin9L|f(GI*2;uZ;uA;HGe(7KC|0|F{o6`sjrW+kZxOd zzc9)A7NFxthQrN+71x-qTADd=5|3+eVcr~?(qcf?r$emcp0y?fv*!YS_H=j5f~D8l z=-^Cf#9_B+$isi(Ltco6+DfN!jQ5=tgccb3=03*NS=+W-)`i-_dejlw;0xPF=Tme_ zi&gNOZwDr&WaBXnhYPNJB;hrJeUTsM24`2eLF;Vu^cS-NR^P3j<``CY+D)e&k=B!cl5jOh>EdZl$PuBe<`TLraHN|_#cqN`mrz) z(UQi*M^$jsR59t)98B66;UHOuaK~$X=E7>`f7NjI<<+wFli|97?U7`FJNjxe%_}$M z+qg{>*5RJ?AYo3onoOpnbB0aQ$jj)K0Bba`Cqb$LFU&LAMT!%7cPD<1bWUA?m_qfE zijfGC7dc_P&JXxzdXzLWQD;Jmj!G+{xUBdBg*Y?Ybhrdtm_rvmXXZgEJ-Xg+VS=_7 z+}M~1k+`gH zsL8kspGYuHiZ?X{62W0iIUIbV=Bd)l7i`aWYG_n4;q?`W=8LSV1qA2Tu8~mvf_DJ$ z1#t~@+E@cO#=XJ4#A*;3Nj}Ng1vANs3}%h&k*DJAVg;=&k=LP+cX=hN{3Z5X)92&^ zqP?R|)lJu{fh@&uk9!HKuTRxSqj}Ds(0T*N=}zt;XsN$*v8E)AZQGX2^G=R8EZ2-r zrDT2mCS=e=c6Cil?S}6VS};0>29}V*9(~x*nfg@ZSk<^9{jPw}iFHl{_NJ0ewjycO zx?WsYma{x6?D36*y_EEg*zHSr5^}A%e=0SEo+%xOzxVev0-`RPA@O^{+%c~PY^>|-1cznstS#N2oi?DW-Gos9D} zq3W{ndFQfTIOW>=G9xp#RPXqJr9UlhS!lQJ1IQtpdXqn48#$WPOF+U(Fm4J!vbC%U%taT zGtKK=;wJX#3KH@9df=oZXoMt(TR-JJ4l*a)|DS1?p_&YNRq&It92D_Z{7FNnS~gW6Iwf+?3o?C0Gd$gS(GeBNZy!8~2m zsEMtJ@7Qo9V4C*CmjZFi2khUAw!@#hN_<(ZB>D`gyKe58sAqejFf9CdV#8fOmC!iw z`Q>70&1ZL4(Q0C`5I@J-nWIT|HB0`;Wxr??t^6WP4oI+tdbw>)&{GMyEm3(L9eAL{ z{$rLj#pS#`VIWDQK z5{os3Bf6S}bRp)8CPP0pL5sF*o-GKLbzDrtOE^}{6VVTRy(rqCsH3ePT+fEFCu#HV z$-cIZTLl}zjbcwX1ZtHdgoA~bKV-}UJKK{NU4il`u03J{O-SF4qJ}s!lWj!0#yl|Q zArWlc;2?>%<;mpy#+~kjn6@XLi37OZ4V7bcOlDC{hWxz^LKlGfw?vpyTM6ec_8{?5 zJV$fH1{;3}=kDnbr+(AAUZg-BrusA#$I;;9MmlgDc|Qfh@xN}Os105^itajg4r`HnZ6#sS6Fu$&QPJ!NQN#I z1#c$N_~WY!e`gH%n^5%eM?)D(ZJLdG4mrd6MOb*y@uIDK4*OT*6Y}5ib$a5sQ}mS_kAUm$yb8 zN;QE_W@nN0JkEgc!&fu2Pw#9FPmH6!hmzRY>Z@d-7Z-buvs&o!E?BX#tiVCFWzp@< zuSvSR&O^G&D4i`UC@e~K9@jXP0gr)8+)>6-XHHAo4Xfsixdpoj# zKCQ+^nB1Q+W^z+b>9rS~wv2Lh{Ok&HQ?GGmvUn$9N27{xit-2%4uzgJ8SNR98Zn0O zP&;Gk-7@_l zky?EeV9)@J?zs7ouo=ccd?$pIdK>agLQ{@r(p-!3b9e^Wbb&_(**bm|bKz-3J#yd|OafG|WsH1_>iB z!&{s~8hz_yeZ^1Wi7KpztrPN%+ru0VokTxHSEQSK~wmQy_#d*rw2gJ1Ks z)0469D%`bPNX@lx6WtuAl$`L4X0**It&6#be>#6j4^>R+gxQUbdj0+E%?fA85}A|9 z%!BN$Y5AM^wlUCt#Q-n$g=rcgaEaTE2Qtm_?Gk1|91GK?{3wxaSq!n_MN`F1Ux0e( zG^;sVZcLDb&3dUoq#V0$HF668EV0fnS_H7 zn2ODQ%$ka>mO6&4yJ!lTGRItR?ZwT}<*oxClXT3`D;dEO=ggE+sL9@6ke>Tb-@@r> zrHtE2etOK5yow&a8Pyf6T*h?`tEB5(id)MVY20qlR?e;+bsph%YTg@AlGWp=(@E>8 zn#}%s(&7z_zs4u62V1I(i*-mHwS6kJy3$7dKHqh(*C%alB*aDM5YK#bVSBT2&K&=2 zBjc{=61IusmD7U5oxLqECrY*NbeG&N4{G!|13hdZR zM!$inBc8N;8GN;&PQu7t4=c?&xk4=GETH4G!BfgIJEN=Li#Dw-`YIfTlQ_+-Vks;uZt1HxOh! z{hm=;wgwndYgubN{KdwhecW-?<+YI$)D(Rw-DvVE4QtE}`uld(E!p6 zI!L7liUtcJ*ctN2s=vK^y$-y$_D6dNU=sNfL>2*4XQuLAOq`P+&>}+dBS&0r^4z_> z<5gvW2=QX2KHyvB`_#i%9a1^(!tl9P(E?9K0QlttD#M|J?}y_Wvv8W*kLmV8p>v%_ z02^jgIa<|?CYE@LhZ-jEBe%HZ>(aGvtgB7u8Qd!Qv{U^%z%+-2{e=?ixE-E`UXOT8 z?qY7K57}Atq)(*+r2B7gIA|G(?C|3;O&@VQT5uo61CeTryk|e!8(Qb@I(HNpFf|jB z7jOZ2muAuQZu+WJu7m_WDODdeqxHV)m2Lq#eURld=6z~>>#JFFYvEUkRCiCXGNj!I z@O^T{=5WgJ$7935W{;uc$X*n>qfOEdhMFvsd4H~|Nj5aflH)+f*d70T7qIpiDN$o( z7_``(vula?VSBKtm#>5OzHJGAcsK~R%ZF<@lWyKgUWQ^R!RG;D_yl zA7ZOtlw^aPN+E3vxjQm18KuK*V|I|~#({KybF+-dn7oZd++bT1o{2Ulea>fv>07EU zcUN)t<_;=qaBF}HmB`1oeA>2<^vdumkeen_ySEEGO5V}n2~l67+0ZZDxO5i+Y4!}Z z{B0lO8*u)H=q5=>^-%Hzq42=~;%x6EL{5BRuQ6x-0^E
MonetDB: mosaic - merge with default
Changeset: 7a480ad822fa for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a480ad822fa Added Files: sql/backends/monet5/Tests/rapi14.sql sql/test/Users/Tests/changePasswordUser.SQL.py sql/test/Users/Tests/changePasswordUser.stable.err sql/test/Users/Tests/changePasswordUser.stable.out sql/test/Users/Tests/changeSchemaUser.SQL.py sql/test/Users/Tests/changeSchemaUser.stable.err sql/test/Users/Tests/changeSchemaUser.stable.out sql/test/Users/Tests/createSetUp.sql.src sql/test/Users/Tests/createSetUp.stable.err sql/test/Users/Tests/createSetUp.stable.out sql/test/Users/Tests/grantMonetdbToRegularUser.Bug-3771.SQL.py sql/test/Users/Tests/grantMonetdbToRegularUser.Bug-3771.stable.err sql/test/Users/Tests/grantMonetdbToRegularUser.Bug-3771.stable.out sql/test/Users/Tests/grantMonetdbToSchemaOwner.Bug-3771.SQL.py sql/test/Users/Tests/grantMonetdbToSchemaOwner.Bug-3771.stable.err sql/test/Users/Tests/grantMonetdbToSchemaOwner.Bug-3771.stable.out sql/test/Users/Tests/grantRole.Bug-3772.SQL.py sql/test/Users/Tests/grantRole.Bug-3772.stable.err sql/test/Users/Tests/grantRole.Bug-3772.stable.out sql/test/Users/Tests/renameUser.SQL.py sql/test/Users/Tests/renameUser.stable.err sql/test/Users/Tests/renameUser.stable.out sql/test/Users/Tests/role.SQL.py sql/test/Users/Tests/role.stable.err sql/test/Users/Tests/role.stable.out sql/test/Users/createSetUp.sql Modified Files: MonetDB.spec debian/control sql/server/rel_select.c sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/Dependencies/dependency_owner_schema_3.sql sql/test/Users/Tests/All sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 testing/process.py Branch: mosaic Log Message: merge with default diffs (truncated from 1960 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -135,6 +135,12 @@ BuildRequires: samtools-devel BuildRequires: R-core-devel %endif +%if (0%{?fedora} >= 22) +Recommends: %{name}-SQL-server5 +Recommends: MonetDB5-server +Suggests: %{name}-client +%endif + # need to define python_sitelib on RHEL 5 and older # no need to define python3_sitelib: it's defined by python3-devel %if 0%{?rhel} && 0%{?rhel} <= 5 @@ -226,6 +232,9 @@ library. %package client Summary: MonetDB - Monet Database Management System Client Programs Group: Applications/Databases +%if (0%{?fedora} >= 22) +Recommends: %{name}-SQL-server5 +%endif %description client MonetDB is a database management system that is developed from a @@ -588,6 +597,11 @@ Group: Applications/Databases Requires(pre): shadow-utils Requires: %{name}-client%{?_isa} = %{version}-%{release} Obsoletes: MonetDB5-server-rdf +%if (0%{?fedora} >= 22) +Recommends: %{name}-SQL-server5 +Recommends: MonetDB5-server-hugeint +Suggests: %{name}-client +%endif %description -n MonetDB5-server MonetDB is a database management system that is developed from a @@ -723,6 +737,10 @@ Requires: %{_bindir}/systemd-tmpfiles %endif Obsoletes: MonetDB-SQL-devel Obsoletes: %{name}-SQL +%if (0%{?fedora} >= 22) +Recommends: %{name}-SQL-server5-hugeint +Suggests: %{name}-client +%endif %description SQL-server5 MonetDB is a database management system that is developed from a diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -95,6 +95,7 @@ Description: MonetDB client/server inter Package: monetdb-client Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: monetdb5-sql Description: MonetDB database client MonetDB is a database management system that is developed from a main-memory perspective with use of a fully decomposed storage model, @@ -221,6 +222,8 @@ Description: MonetDB5 SQL GIS support mo Package: monetdb5-server Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, adduser +Recommends: monetdb5-server-hugeint, monetdb5-sql +Suggests: monetdb-client Description: MonetDB database server version 5 MonetDB is a database management system that is developed from a main-memory perspective with use of a fully decomposed storage model, @@ -258,6 +261,8 @@ Description: MonetDB database server ver P
MonetDB: mosaic - Merge with default
Changeset: d1a45ff46f89 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d1a45ff46f89 Added Files: buildtools/ChangeLog.Jul2015 clients/ChangeLog.Jul2015 clients/R/MonetDB.R/R/dbapply.R clients/R/MonetDB.R/man/dbApply.Rd clients/R/Tests/dbapply.R clients/R/Tests/dbapply.reqtests clients/R/Tests/dbapply.stable.err clients/R/Tests/dbapply.stable.out clients/R/Tests/dplyr-flights.R clients/R/Tests/dplyr-flights.reqtest clients/R/Tests/dplyr-flights.stable.err clients/R/Tests/dplyr-flights.stable.out clients/mapilib/ChangeLog.Jul2015 clients/python2/ChangeLog.Jul2015 clients/python3/ChangeLog.Jul2015 common/stream/ChangeLog.Jul2015 common/utils/strptime.c debian/monetdb-client-tools.docs debian/monetdb5-server.docs gdk/ChangeLog.Jul2015 geom/ChangeLog.Jul2015 java/ChangeLog.Jul2015 monetdb5/ChangeLog.Jul2015 sql/ChangeLog.Jul2015 sql/backends/monet5/Tests/rapi13.sql sql/scripts/27_rejects.sql sql/scripts/51_sys_schema_extension.sql sql/test/BugTracker-2015/Tests/adddrop_unknown_table.Bug-3718.sql sql/test/BugTracker-2015/Tests/adddrop_unknown_table.Bug-3718.stable.err sql/test/BugTracker-2015/Tests/adddrop_unknown_table.Bug-3718.stable.out sql/test/BugTracker-2015/Tests/cast_to_num.Bug-3744.sql sql/test/BugTracker-2015/Tests/cast_to_num.Bug-3744.stable.err sql/test/BugTracker-2015/Tests/cast_to_num.Bug-3744.stable.out sql/test/BugTracker-2015/Tests/crash.Bug-3736.sql sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.err sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out sql/test/BugTracker-2015/Tests/crash_on_alter_set_not_null.Bug-3715.sql sql/test/BugTracker-2015/Tests/crash_on_alter_set_not_null.Bug-3715.stable.err sql/test/BugTracker-2015/Tests/crash_on_alter_set_not_null.Bug-3715.stable.out sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.sql sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.stable.err sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.stable.out sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.sql sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.stable.err sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.stable.out sql/test/BugTracker-2015/Tests/epoch_now.Bug-3740.sql sql/test/BugTracker-2015/Tests/epoch_now.Bug-3740.stable.err sql/test/BugTracker-2015/Tests/epoch_now.Bug-3740.stable.out sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.sql sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.stable.err sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.stable.out sql/test/BugTracker-2015/Tests/leftjoin.Bug-3720.sql sql/test/BugTracker-2015/Tests/leftjoin.Bug-3720.stable.err sql/test/BugTracker-2015/Tests/leftjoin.Bug-3720.stable.out sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.sql sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.stable.err sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.stable.out sql/test/BugTracker-2015/Tests/mergejoin_NULL.Bug-3747.sql sql/test/BugTracker-2015/Tests/mergejoin_NULL.Bug-3747.stable.err sql/test/BugTracker-2015/Tests/mergejoin_NULL.Bug-3747.stable.out sql/test/BugTracker-2015/Tests/null_is_null.Bug-3739.sql sql/test/BugTracker-2015/Tests/null_is_null.Bug-3739.stable.err sql/test/BugTracker-2015/Tests/null_is_null.Bug-3739.stable.out sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.sql sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.stable.err sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.stable.out sql/test/BugTracker-2015/Tests/savepoint.Bug-3738-1.sql sql/test/BugTracker-2015/Tests/savepoint.Bug-3738-1.stable.err sql/test/BugTracker-2015/Tests/savepoint.Bug-3738-1.stable.out sql/test/BugTracker-2015/Tests/savepoint.Bug-3738-2.sql sql/test/BugTracker-2015/Tests/savepoint.Bug-3738-2.stable.err sql/test/BugTracker-2015/Tests/savepoint.Bug-3738-2.stable.out sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.sql sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.err sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.out sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.sql sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.stable.err sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.stable.out sql/test/BugTracker-2015/Tests/string_split.Bug-3564.sql sql/test/BugTracker-2015/Tests/string_split.Bug-3564.stable.err
MonetDB: mosaic - Merge with default branch.
Changeset: 1840cea59098 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1840cea59098 Modified Files: clients/mapiclient/Tests/mclient--help.stable.err clients/mapiclient/Tests/mclient--help.stable.err.Windows clients/mapiclient/mclient.c clients/mapiclient/tomograph.c gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_cross.c gdk/gdk_join.c gdk/gdk_search.c gdk/gdk_storage.c monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/json.c monetdb5/modules/kernel/algebra.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/joinpath.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/txtsim.c sql/server/rel_optimizer.c Branch: mosaic Log Message: Merge with default branch. diffs (truncated from 557 to 300 lines): diff --git a/clients/mapiclient/Tests/mclient--help.stable.err b/clients/mapiclient/Tests/mclient--help.stable.err --- a/clients/mapiclient/Tests/mclient--help.stable.err +++ b/clients/mapiclient/Tests/mclient--help.stable.err @@ -21,7 +21,7 @@ Options are: -E charset | --encoding=charset specify encoding (character set) of the terminal -f kind | --format=kind specify output format {csv,tab,raw,sql,xml} -H | --history load/save cmdline history (default off) - -i | --interactive[=tm] interpret \ commands on stdin, use time formatting {ms,s,m} + -i | --interactive[=tm] interpret `\' commands on stdin, use time formatting {ms,s,m} -l language | --language=lang{sql,mal} -L logfile | --log=logfile save client/server interaction -s stmt | --statement=stmt run single statement diff --git a/clients/mapiclient/Tests/mclient--help.stable.err.Windows b/clients/mapiclient/Tests/mclient--help.stable.err.Windows --- a/clients/mapiclient/Tests/mclient--help.stable.err.Windows +++ b/clients/mapiclient/Tests/mclient--help.stable.err.Windows @@ -21,7 +21,7 @@ Options are: -E charset | --encoding=charset specify encoding (character set) of the terminal -f kind | --format=kind specify output format {csv,tab,raw,sql,xml} -H | --history load/save cmdline history (default off) - -i | --interactive[=tm] interpret \ commands on stdin, use time formatting {ms,s,m} + -i | --interactive[=tm] interpret `\' commands on stdin, use time formatting {ms,s,m} -l language | --language=lang{sql,mal} -L logfile | --log=logfile save client/server interaction -s stmt | --statement=stmt run single statement diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c --- a/clients/mapiclient/mclient.c +++ b/clients/mapiclient/mclient.c @@ -2861,7 +2861,7 @@ usage(const char *prog, int xit) #endif fprintf(stderr, " -f kind | --format=kind specify output format {csv,tab,raw,sql,xml}\n"); fprintf(stderr, " -H | --history load/save cmdline history (default off)\n"); - fprintf(stderr, " -i | --interactive[=tm] interpret \\ commands on stdin, use time formatting {ms,s,m}\n"); + fprintf(stderr, " -i | --interactive[=tm] interpret `\\' commands on stdin, use time formatting {ms,s,m}\n"); fprintf(stderr, " -l language | --language=lang{sql,mal}\n"); fprintf(stderr, " -L logfile | --log=logfile save client/server interaction\n"); fprintf(stderr, " -s stmt | --statement=stmt run single statement\n"); diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c --- a/clients/mapiclient/tomograph.c +++ b/clients/mapiclient/tomograph.c @@ -8,11 +8,11 @@ /* (c) M Kersten, S Manegold * The easiest calling method is something like: - * tomograph -d demo --atlast=10 + * tomograph -d demo --atlas=10 * which connects to the demo database server and * will collect the tomograph pages for at most 10 SQL queries * For each page a gnuplot file, a data file, and the event trace - * are collected for more focussed analysis. + * are collected for more focused analysis. * */ @@ -68,7 +68,7 @@ die(dbh, hdl); \ } while (0) -#define DBNAME (dbname?dbname:(inputfile?inputfile:"unkown")) +#define DBNAME (dbname?dbname:(inputfile?inputfile:"unknown")) static stream *conn = NULL; static char hostname[128]; @@ -104,7 +104,7 @@ static int source[MAXTHREADS]; /* color map management, fixed */ /* see http://www.uni-hamburg.de/Wiss/FB/15/Sustainability/schneider/gnuplot/colors.htm */ -/* The initial dictionary is geared towars TPCH-use */ +/* The initial dictionary is geared towards TPCH-use */ typedef struct COLOR { int freq; lng timeused; @@ -452,7 +452,7 @@ usageTomograph(void) fprintf(stderr, " -r | --range=-[ms,s] \n"); fprintf(stderr, " -i | --input= \n"); fprintf(stder
MonetDB: mosaic - Merge with default branch.
Changeset: 9889bf8842ce for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9889bf8842ce Modified Files: MonetDB.spec clients/Tests/exports.stable.out clients/mapiclient/eventparser.c clients/mapiclient/mclient.c clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/mapilib/mapi.c gdk/gdk.h gdk/gdk_align.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_bbp.h gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_search.c gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_tm.c gdk/gdk_utils.c monetdb5/mal/mal.h monetdb5/mal/mal_listing.c monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/transaction.c sql/backends/monet5/bam/bam_loader.c sql/backends/monet5/sql_result.c Branch: mosaic Log Message: Merge with default branch. diffs (truncated from 3581 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -160,8 +160,8 @@ more client packages. %package devel Summary: MonetDB development files Group: Applications/Databases -Requires: %{name} = %{version}-%{release} -Requires: %{name}-stream-devel = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-stream-devel%{?_isa} = %{version}-%{release} Requires: libatomic_ops-devel %description devel @@ -201,7 +201,7 @@ various other components. %package stream-devel Summary: MonetDB stream library Group: Applications/Databases -Requires: %{name}-stream = %{version}-%{release} +Requires: %{name}-stream%{?_isa} = %{version}-%{release} Requires: bzip2-devel Requires: libcurl-devel Requires: zlib-devel @@ -249,7 +249,7 @@ MonetDB, you will very likely need this %package client-tools Summary: MonetDB - Monet Database Management System Client Programs Group: Applications/Databases -Requires: %{name}-client = %{version}-%{release} +Requires: %{name}-client%{?_isa} = %{version}-%{release} %description client-tools MonetDB is a database management system that is developed from a @@ -269,8 +269,8 @@ tools can be used to monitor the MonetDB %package client-devel Summary: MonetDB - Monet Database Management System Client Programs Group: Applications/Databases -Requires: %{name}-client = %{version}-%{release} -Requires: %{name}-stream-devel = %{version}-%{release} +Requires: %{name}-client%{?_isa} = %{version}-%{release} +Requires: %{name}-stream-devel%{?_isa} = %{version}-%{release} Requires: openssl-devel %description client-devel @@ -292,7 +292,7 @@ This package contains the files needed t %package client-odbc Summary: MonetDB ODBC driver Group: Applications/Databases -Requires: %{name}-client = %{version}-%{release} +Requires: %{name}-client%{?_isa} = %{version}-%{release} Requires(pre): unixODBC %description client-odbc @@ -349,7 +349,6 @@ program. %package client-perl Summary: MonetDB perl interface Group: Applications/Databases -Requires: %{name}-client = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(DBI) Requires: perl(Digest::SHA) @@ -428,12 +427,12 @@ This package contains the activerecord a %package client-tests Summary: MonetDB Client tests package Group: Applications/Databases -Requires: MonetDB5-server = %{version}-%{release} -Requires: %{name}-client = %{version}-%{release} -Requires: %{name}-client-odbc = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} +Requires: %{name}-client%{?_isa} = %{version}-%{release} +Requires: %{name}-client-odbc%{?_isa} = %{version}-%{release} Requires: %{name}-client-perl = %{version}-%{release} Requires: %{name}-client-php = %{version}-%{release} -Requires: %{name}-SQL-server5 = %{version}-%{release} +Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release} Requires: python-monetdb = %{version}-%{release} %description client-tests @@ -466,7 +465,7 @@ developer. %package geom-MonetDB5 Summary: MonetDB5 SQL GIS support module Group: Applications/Databases -Requires: MonetDB5-server = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} Obsoletes: %{name}-geom Obsoletes: %{name}-geom-devel @@ -490,7 +489,7 @@ extensions for %{name}-SQL-server5. %package gsl-MonetDB5 Summary: MonetDB5 SQL interface to the gsl library Group: Applications/Databases -Requires: MonetDB5-server = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} %description gsl-MonetDB5 MonetDB is a database management system that is developed from a @@ -512,7 +511,7 @@ numeric
MonetDB: mosaic - Merge with default branch.
Changeset: da5e64d9a814 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da5e64d9a814 Added Files: sql/test/mergetables/Tests/mergequery.stable.out.single Modified Files: clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c gdk/gdk_group.c gdk/gdk_join.c gdk/gdk_storage.c sql/storage/bat/bat_logger.c sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: mosaic Log Message: Merge with default branch. diffs (truncated from 471 to 300 lines): diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c --- a/clients/mapiclient/tachograph.c +++ b/clients/mapiclient/tachograph.c @@ -960,9 +960,9 @@ main(int argc, char **argv) doQ(buf); if( cache){ #ifdef NATIVE_WIN32 - if( access(cache,F_OK) && _mkdir(cache)){ + if( _mkdir(cache) < 0 && errno != EEXIST){ #else - if( access(cache,F_OK) && mkdir(cache,0755) ) { + if( mkdir(cache,0755) < 0 && errno != EEXIST) { #endif fprintf(stderr,"Failed to create cache '%s'\n",cache); exit(-1); diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c --- a/clients/mapiclient/tomograph.c +++ b/clients/mapiclient/tomograph.c @@ -1735,9 +1735,9 @@ main(int argc, char **argv) /* reprocess an existing profiler trace, possibly producing the trace split */ if (cache) { #ifdef NATIVE_WIN32 - if( access(cache, F_OK) && _mkdir(cache)){ + if( _mkdir(cache) < 0 && errno != EEXIST){ #else - if( access(cache, F_OK) && mkdir(cache,0755) ) { + if( mkdir(cache,0755) < 0 && errno != EEXIST) { #endif fprintf(stderr,"Failed to create cache '%s'\n",cache); exit(-1); diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c --- a/gdk/gdk_group.c +++ b/gdk/gdk_group.c @@ -69,12 +69,14 @@ maxgrps = BATcount(b); \ if (extents) { \ BATsetcount(en, ngrp); \ - BATextend(en, maxgrps); \ + if (BATextend(en, maxgrps) != GDK_SUCCEED) \ + goto error; \ exts = (oid *) Tloc(en, BUNfirst(en)); \ } \ if (histo) {\ BATsetcount(hn, ngrp); \ - BATextend(hn, maxgrps); \ + if (BATextend(hn, maxgrps) != GDK_SUCCEED) \ + goto error; \ cnts = (wrd *) Tloc(hn, BUNfirst(hn)); \ } \ } \ diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c --- a/gdk/gdk_join.c +++ b/gdk/gdk_join.c @@ -3279,10 +3279,17 @@ BATproject(BAT *l, BAT *r) } assert(l->ttype == TYPE_oid); - if (ATOMstorage(tpe) == TYPE_str && l->T->nonil && - (rcount == 0 || lcount > (rcount >> 3))) { + if (ATOMstorage(tpe) == TYPE_str && + l->T->nonil && + (rcount == 0 || +lcount > (rcount >> 3) || +r->batRestricted == BAT_READ)) { /* insert strings as ints, we need to copy the string -* heap whole sale */ +* heap whole sale; we can not do this if there are +* nils in the left column, and we will not do it if +* the left is much smaller than the right and the +* right is writable (meaning we have to actually copy +* the right string heap) */ tpe = r->T->width == 1 ? TYPE_bte : (r->T->width == 2 ? TYPE_sht : (r->T->width == 4 ? TYPE_int : TYPE_lng)); /* int's nil representation is a valid offset, so * don't check for nils */ diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c --- a/gdk/gdk_storage.c +++ b/gdk/gdk_storage.c @@ -271,7 +271,7 @@ GDKextendf(int fd, size_t size, const ch IODEBUG t0 = GDKms(); if (stb.st_size < (off_t) size) { #ifdef HAVE_FALLOCATE - if (fallocate(fd, 0, stb.st_size, (off_t) size - stb.st_size) < 0 && + if ((rt = fallocate(fd, 0, stb.st_size, (off_t) size - stb.st_size)) < 0 && errno
MonetDB: mosaic - Merge with default branch.
Changeset: cf441e717e5c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf441e717e5c Added Files: sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.sql sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.stable.err sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.stable.out Modified Files: MonetDB.spec clients/Tests/exports.stable.out clients/mapiclient/eventparser.h clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c debian/control gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc.h gdk/gdk_calc_compare.h gdk/gdk_cross.c gdk/gdk_delta.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_join_legacy.c gdk/gdk_logger.c gdk/gdk_select.c gdk/gdk_setop.c gdk/gdk_storage.c gdk/gdk_utils.c gdk/gdk_value.c geom/monetdb5/geom.c monetdb5/mal/mal_atom.c monetdb5/mal/mal_profiler.c monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/uuid.c monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/logger.c monetdb5/modules/kernel/microbenchmark.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/calc.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tokenizer.c sql/backends/monet5/generator/generator.c sql/backends/monet5/sql.c sql/backends/monet5/sql_result.c sql/include/sql_mem.h sql/server/rel_schema.c sql/test/BugTracker-2015/Tests/All sql/test/pg_regress/Tests/timestamptz.stable.out testing/malcheck.py Branch: mosaic Log Message: Merge with default branch. diffs (truncated from 4092 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -161,6 +161,8 @@ more client packages. Summary: MonetDB development files Group: Applications/Databases Requires: %{name} = %{version}-%{release} +Requires: %{name}-stream-devel = %{version}-%{release} +Requires: libatomic_ops-devel %description devel MonetDB is a database management system that is developed from a @@ -688,6 +690,7 @@ MonetDB5-server component. Summary: MonetDB development files Group: Applications/Databases Requires: MonetDB5-server = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} %description -n MonetDB5-server-devel MonetDB is a database management system that is developed from a 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 @@ -30,7 +30,7 @@ BAT *BATcalcadd(BAT *b1, BAT *b2, BAT *s BAT *BATcalcaddcst(BAT *b, const ValRecord *v, BAT *s, int tp, int abort_on_error); BAT *BATcalcand(BAT *b1, BAT *b2, BAT *s); BAT *BATcalcandcst(BAT *b, const ValRecord *v, BAT *s); -int BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN *vals); +gdk_return BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN *vals); BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi, BAT *s, int sym); BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi, BAT *s, int sym); BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi, BAT *s, int sym); @@ -338,34 +338,34 @@ void *VALget(ValPtr v); ValPtr VALinit(ValPtr d, int tpe, const void *s); int VALisnil(const ValRecord *v); ValPtr VALset(ValPtr v, int t, ptr p); -int VARcalcabsolute(ValPtr ret, const ValRecord *v); -int VARcalcadd(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int abort_on_error); -int VARcalcand(ValPtr ret, const ValRecord *lft, const ValRecord *rgt); -int VARcalcbetween(ValPtr ret, const ValRecord *v, const ValRecord *lo, const ValRecord *hi, int sym); -int VARcalccmp(ValPtr ret, const ValRecord *lft, const ValRecord *rgt); -int VARcalcdecr(ValPtr ret, const ValRecord *v, int abort_on_error); -int VARcalcdiv(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int abort_on_error); -int VARcalceq(ValPtr ret, const ValRecord *lft, const ValRecord *rgt); -int VARcalcge(ValPtr ret, const ValRecord *lft, const ValRecord *rgt); -int VARcalcgt(ValPtr ret, const ValRecord *lft, const ValRecord *rgt); -int VARcalcincr(ValPtr ret, const ValRecord *v, int abort_on_error); -int VARcalcisnil(ValPtr ret, const ValRecord *v); -int VARcalcisnotnil(ValPtr ret, const ValRecord *v); -int VARcalciszero(ValPtr ret, const ValRecord *v); -int VARcalcle(ValPtr ret, const ValRecord *lft, const ValRecord *rgt); -int VARcalclsh(ValPtr ret, const ValRecord *lft, const ValReco
MonetDB: mosaic - Merge with default branch.
Changeset: 104f67c3af17 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=104f67c3af17 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/mapiclient/tomograph.c configure.ag gdk/gdk_value.c monetdb5/extras/rapi/rapi.c monetdb5/mal/mal_interpreter.c monetdb5/modules/atoms/json.c monetdb5/modules/mal/Tests/inspect00.stable.out monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/mdb.mal testing/Mtest.py.in Branch: mosaic Log Message: Merge with default branch. diffs (truncated from 595 to 300 lines): 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 @@ -39090,7 +39090,7 @@ pattern mdb.getDefinition():bat[:oid,:st address MDBgetDefinition; comment Returns a string representation of the current functionwith typing information attached -pattern mdb.getStackTrace() (X_1:bat[:oid,:str],X_2:bat[:oid,:str]) +pattern mdb.getStackTrace() (X_1:bat[:oid,:int],X_2:bat[:oid,:str]) address MDBStkTrace; pattern mdb.getStackFrame() (X_1:bat[:oid,:str],X_2:bat[:oid,:str]) address MDBgetStackFrame; 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 @@ -50021,7 +50021,7 @@ pattern mdb.getDefinition():bat[:oid,:st address MDBgetDefinition; comment Returns a string representation of the current functionwith typing information attached -pattern mdb.getStackTrace() (X_1:bat[:oid,:str],X_2:bat[:oid,:str]) +pattern mdb.getStackTrace() (X_1:bat[:oid,:int],X_2:bat[:oid,:str]) address MDBStkTrace; pattern mdb.getStackFrame() (X_1:bat[:oid,:str],X_2:bat[:oid,:str]) address MDBgetStackFrame; diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c --- a/clients/mapiclient/tomograph.c +++ b/clients/mapiclient/tomograph.c @@ -362,6 +362,7 @@ base_colors[NUM_COLORS] = { /* 2 */{ 0, 0, "calc", "bit", 0 }, /* 2 */{ 0, 0, "calc", "*", 0 }, /* 2 */{ 0, 0, "algebra", "thetajoin", 0 }, +/* 2 */{ 0, 0, "algebra", "subthetajoin", 0 }, /* 1 */{ 0, 0, "sql", "dec_round", 0 }, /* 1 */{ 0, 0, "pqueue", "topn_min", 0 }, /* 1 */{ 0, 0, "mtime", "date_sub_msec_interval", 0 }, @@ -377,6 +378,20 @@ base_colors[NUM_COLORS] = { /* 1 */{ 0, 0, "aggr", "max", 0 }, /* ? */{ 0, 0, "aggr", "avg", 0 }, /* ? */{ 0, 0, "aggr", "subavg", 0 }, +/* ? */{ 0, 0, "aggr", "submedian", 0 }, +/* ? */{ 0, 0, "aggr", "subquantile", 0 }, +/* ? */{ 0, 0, "aggr", "substdev", 0 }, +/* ? */{ 0, 0, "batcalc", "floor", 0 }, +/* ? */{ 0, 0, "batcalc", "identity", 0 }, +/*? */ { 0, 0, "batmkey", "hash", 0 }, +/*? */ { 0, 0, "calc", "hge", 0 }, +/*? */ { 0, 0, "batcalc", "hge", 0 }, +/*? */ { 0, 0, "algebra", "firstn", 0 }, +/*? */ { 0, 0, "sql", "single", 0 }, +/*? */ { 0, 0, "algebra", "crossproduct", 0 }, +/*? */ { 0, 0, "profiler", "wait", 0 }, +/*? */ { 0, 0, "querylog", "define", 0 }, +/*? */ { 0, 0, "*", "*", 0 }, /* 0 */{ 0, 0, 0, 0, 0 } }; @@ -963,6 +978,14 @@ showcolormap(char *filename, int all) lng totfreq = 0, tottime = 0; Color *clrs = colors, *_clrs_ = NULL; char *c; + time_t tm; + char *date; + + tm = time(0); + date = ctime(&tm); + if (strchr(date, '\n')) + *strchr(date, '\n') = 0; + // count size of query text for (nl=0, c= currentquery; c && *c; c++) @@ -1055,23 +1078,25 @@ showcolormap(char *filename, int all) fprintf(f, "\" at 0,%d\n", h - 70); // show complete query text if( currentquery ){ - h = h1-30; + h = h1-40; //fprintf(gnudata, "set object %d rectangle from %d.0, 250.0 to %d.0,%d.0\n", object++, 3 * w, 5 *w , h -5); fprintf(f, "set label %d \"", object++); k=0; for (c= currentquery; *c; c++){ - if (*c == '"') fprintf(gnudata,"\\"); else - if (*c == '\t') fprintf(gnudata," "); else - if (*c == '\n') { fprintf(gnudata,"\\n"); k=0; continue;} else + if (*c == '"') fprintf(f,"\\"); else + if (*c == '\t') fprintf(f," "); else + if (*c == '\n') { fprintf(f,"\\n"); k=0; continue;} else if( ++k >60 && (*c == ' ' || *c =='\t')){ - fprintf(gnudata,"\\n"); + fprintf(f,"\\n"); k = 1;
MonetDB: mosaic - Merge with default branch.
Changeset: fc49a14f3bc9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fc49a14f3bc9 Modified Files: NT/winconfig.py gdk/gdk_logger.c sql/backends/monet5/sql_upgrades.c sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 testing/Mtest.py.in Branch: mosaic Log Message: Merge with default branch. diffs (truncated from 582 to 300 lines): diff --git a/NT/winconfig.py b/NT/winconfig.py --- a/NT/winconfig.py +++ b/NT/winconfig.py @@ -31,7 +31,7 @@ subs = [("@exec_prefix@", r'%prefix%'), ("@DIRSEP@", '\\'), ("@PATHSEP@", ';')] -if len(sys.argv) > 1 and sys.argv[1][-19:] == '\\winconfig_conds.py': +if len(sys.argv) > 1 and sys.argv[1].endswith(r'\winconfig_conds.py'): conds = {} for line in fileinput.input(sys.argv[1]): exec(line, None, conds) @@ -50,8 +50,11 @@ while len(sys.argv) > 2 and '=' in sys.a subs.append(('@SOURCE@', os.path.abspath(os.path.dirname(os.path.dirname(sys.argv[0]) for key, val in subs[:]: +# X prefix for execution-time value subs.insert(0, ('@X'+key[1:], val)) +# Q prefix for quoted value (i.e. \ needs to be scaped) subs.insert(0, ('@Q'+key[1:], val.replace('\\', r'\\'))) +# QX prefix for quoted execution-time value subs.insert(0, ('@QX'+key[1:], val.replace('\\', r'\\'))) def substitute(line): diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c --- a/gdk/gdk_logger.c +++ b/gdk/gdk_logger.c @@ -819,7 +819,7 @@ logger_open(logger *lg) { char filename[BUFSIZ]; - snprintf(filename, BUFSIZ, "%s%s." LLFMT, lg->dir, LOGFILE, lg->id); + snprintf(filename, sizeof(filename), "%s%s." LLFMT, lg->dir, LOGFILE, lg->id); lg->log = open_wstream(filename); lg->end = 0; @@ -837,8 +837,7 @@ logger_close(logger *lg) stream *log = lg->log; if (log) { - mnstr_close(log); - mnstr_destroy(log); + close_stream(log); } lg->log = NULL; } @@ -984,13 +983,13 @@ logger_readlogs(logger *lg, FILE *fp, ch if (lg->debug & 1) fprintf(stderr, "#logger_readlogs %s\n", filename); - while (fgets(id, BUFSIZ, fp) != NULL) { + while (fgets(id, sizeof(id), fp) != NULL) { char buf[BUFSIZ]; lng lid = strtoll(id, NULL, 10); if (lid >= lg->id) { lg->id = lid; - snprintf(buf, BUFSIZ, "%s." LLFMT, filename, lg->id); + snprintf(buf, sizeof(buf), "%s." LLFMT, filename, lg->id); if ((res = logger_readlog(lg, buf)) != 0) { /* we cannot distinguish errors from @@ -1078,8 +1077,9 @@ bm_subcommit(BAT *list_bid, BAT *list_nm n[i++] = 0; /* n[0] is not used */ BATloop(list_bid, p, q) { bat col = *(log_bid *) Tloc(list_bid, p); + oid pos = p; - if (list_bid == catalog_bid && BUNfnd(dcatalog, &p) != BUN_NONE) + if (list_bid == catalog_bid && BUNfnd(dcatalog, &pos) != BUN_NONE) continue; if (debug & 1) fprintf(stderr, "#commit new %s (%d) %s\n", @@ -1091,12 +1091,12 @@ bm_subcommit(BAT *list_bid, BAT *list_nm if (extra) { iter = bat_iterator(extra); BATloop(extra, p, q) { - str name = (str) BUNtail(iter, p); + str name = (str) BUNtvar(iter, p); if (debug & 1) fprintf(stderr, "#commit extra %s %s\n", name, - (list_bid == catalog_bid) ? BUNtail(iter, p) : "snapshot"); + (list_bid == catalog_bid) ? BUNtvar(iter, p) : "snapshot"); assert(BBPindex(name)); n[i++] = abs(BBPindex(name)); } @@ -1163,7 +1163,7 @@ logger_new(int debug, const char *fn, co lg->read32bitoid = 0; #endif - snprintf(filename, BUFSIZ, "%s%c%s%c", logdir, DIR_SEP, fn, DIR_SEP); + snprintf(filename, sizeof(filename), "%s%c%s%c", logdir, DIR_SEP, fn, DIR_SEP); if ((lg->fn = GDKstrdup(fn)) == NULL || (lg->dir = GDKstrdup(filename)) == NULL) { fprintf(stderr, "!ERROR: logger_new: strdup failed\n"); @@ -1186,8 +1186,8 @@ logger_new(int debug, const char *fn, co lg->seqs_val = NULL; lg->dseqs = NULL; - snprintf(filename, BUFSIZ, "%s%s", lg->dir, LOGFILE); - snprintf(bak, BUFSIZ, "%s.bak", filename); + snprintf(filename, sizeof(filename), "%s%s", lg->dir, LOGFILE); + s
MonetDB: mosaic - Merge with default branch.
Changeset: 566284eae5cc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=566284eae5cc Modified Files: clients/mapiclient/tomograph.c gdk/gdk_logger.c Branch: mosaic Log Message: Merge with default branch. diffs (296 lines): diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c --- a/clients/mapiclient/tomograph.c +++ b/clients/mapiclient/tomograph.c @@ -776,10 +776,11 @@ showmemory(void) static char * getHeatColor(double load) { - if ( load > 0.75 ) return "yellow"; + if ( load > 0.9 ) return "red"; + if ( load > 0.75 ) return "orangered"; if ( load > 0.5 ) return "orange"; - if ( load > 0.25 ) return "red"; - if ( load > 0.02 ) return "blue"; + if ( load > 0.25 ) return "gold"; + if ( load > 0.02 ) return "yellow"; return "white"; } @@ -796,7 +797,7 @@ showcpu(void) fprintf(gnudata, "set lmarg 10\n"); fprintf(gnudata, "set rmarg 10\n"); fprintf(gnudata, "set size 1,0.%02d\n", cpus?cpus:1); - fprintf(gnudata, "set origin 0.0, 0.%d\n", 89 - cpus); + fprintf(gnudata, "set origin 0.0, 0.%d\n", 88 - cpus); fprintf(gnudata, "set ylabel \"CPU\"\n"); fprintf(gnudata, "unset xtics\n"); fprintf(gnudata, "unset ytics\n"); @@ -949,18 +950,23 @@ fprintf_time(FILE *f, lng time) } /* produce a legenda image for the color map */ -#define COLUMNS 5 +#define COLUMNS 3 static void showcolormap(char *filename, int all) { FILE *f = 0; char buf[BUFSIZ]; - int i, k = 0; + int i, k = 0,nl; int w = 380; // 600 for 3 columns - int h = 590; + int h = 590, h1=h; lng totfreq = 0, tottime = 0; Color *clrs = colors, *_clrs_ = NULL; + char *c; + + // count size of query text + for (nl=0, c= currentquery; c && *c; c++) + nl += *c == '\n'; if (all) { snprintf(buf, BUFSIZ, "%s%s_%s_%02d.gpl", cachebuf, basefilename, dbname, atlaspage); @@ -989,7 +995,7 @@ showcolormap(char *filename, int all) fprintf(f, "set lmarg 10\n"); fprintf(f, "set rmarg 10\n"); fprintf(f, "set size 1,0.4\n"); - fprintf(f, "set origin 0.0,%s\n", "-0.05"); + fprintf(f, "set origin 0.0,%s\n", "-0.04"); fprintf(f, "set xrange [0:1800]\n"); fprintf(f, "set yrange [0:600]\n"); fprintf(f, "unset xtics\n"); @@ -1016,17 +1022,15 @@ showcolormap(char *filename, int all) tottime += clrs[i].timeused; totfreq += clrs[i].freq; - if (k % COLUMNS == 0) - h -= 45; + if (k % COLUMNS == 0 && i) + h -= 35; fprintf(f, "set object %d rectangle from %.2f, %.2f to %.2f, %.2f fillcolor rgb \"%s\" fillstyle solid 1.0\n", - object++, (double) (k % COLUMNS) * w, (double) h - 40, (double) ((k % COLUMNS) * w + 0.05 * w), (double) h - 5, clrs[i].col); + object++, (double) (k % COLUMNS) * w, (double) h - 40, (double) ((k % COLUMNS) * w + 0.09 * w), (double) h - 15, clrs[i].col); fprintf(f, "set label %d \"%s.%s \" at %d,%d\n", - object++, (clrs[i].mod?clrs[i].mod:""), clrs[i].fcn, (int) ((k % COLUMNS) * w + 0.07 * w), h - 15); - fprintf(f, "set label %d \"%d call%s: ", - object++, clrs[i].freq, clrs[i].freq>1?"s":""); + object++, (clrs[i].mod?clrs[i].mod:""), clrs[i].fcn, (int) ((k % COLUMNS) * w + 0.1 * w), h - 20); + fprintf(f, "set label %d \"%d call%s: ", object++, clrs[i].freq, clrs[i].freq>1?"s":""); fprintf_time(f, clrs[i].timeused); - fprintf(f, "\" at %f,%f\n", - (double) ((k % COLUMNS) * w + 0.07 * w), (double) h - 35); + fprintf(f, "\" at %f,%f\n", (double) ((k % COLUMNS) * w + 0.1 * w), (double) h - 35); k++; } else { clrs[0].timeused += clrs[i].timeused; @@ -1039,13 +1043,35 @@ showcolormap(char *filename, int all) _clrs_ = NULL; } - h -= 45; - fprintf(f, "set label %d \" "LLFMT" MAL instructions executed; total CPU core time: ", - object++, totfreq); + h -= 30; + fprintf(f, "set label %d \"MAL instructions executed: "LLFMT, object++, totfreq); + fprintf(f, "\" at 0,%d\n", h - 30); + + fprintf(f, "set label %d \"Total CPU core time: ", object
MonetDB: mosaic - Merge with default branch.
Changeset: 99bdb90d72a1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99bdb90d72a1 Modified Files: NT/wincompile.py clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/mapiclient/Tests/tomograph--help.stable.err clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c Branch: mosaic Log Message: Merge with default branch. diffs (truncated from 1135 to 300 lines): diff --git a/NT/wincompile.py b/NT/wincompile.py --- a/NT/wincompile.py +++ b/NT/wincompile.py @@ -65,6 +65,7 @@ def process(args, recursive = False): dirname = os.path.dirname(arg) p = subprocess.Popen(['lib', '/nologo', '/list', arg], shell = False, + universal_newlines = True, stdout = subprocess.PIPE) for f in p.stdout: argv.append(os.path.join(dirname, f.strip())) @@ -78,10 +79,11 @@ argv = process(sys.argv[1:]) if verbose: sys.stdout.write('EXECUTE: %s\n' % ' '.join(argv)) sys.stdout.flush() -p = subprocess.Popen(argv, shell = False, stdout = subprocess.PIPE, stderr = subprocess.PIPE) +p = subprocess.Popen(argv, shell = False, universal_newlines = True, + stdout = subprocess.PIPE, stderr = subprocess.PIPE) out, err = p.communicate() -sys.stdout.write(out.replace('\r\n', '\n')) -sys.stderr.write(err.replace('\r\n', '\n')) +sys.stdout.write(out) +sys.stderr.write(err) if p.returncode and not verbose: sys.stderr.write('failed invocation: %s\n' % ' '.join(argv)) sys.stderr.flush() 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 @@ -37722,7 +37722,7 @@ command color.color(s:str):color address CLRcolor; comment Converts string to color -command color.#fromstr():color +command color.#fromstr():void address color_fromstr; command color.green(c:color):int address CLRgreen; @@ -37764,7 +37764,7 @@ command color.str(s:color):str address CLRstr; comment Converts color to string -command color.#tostr():str +command color.#tostr():void address color_tostr; command color.value(c:color):flt address CLRvalue; @@ -37802,13 +37802,13 @@ pattern daytime.>(v:daytime,w:daytime):b address CMDvarGT; comment Equality of two daytimes -command daytime.#fromstr():daytime +command daytime.#fromstr():void address daytime_tz_fromstr; pattern daytime.isnil(v:daytime):bit address CMDvarISNIL; comment Nil test for daytime value -command daytime.#tostr():str +command daytime.#tostr():void address daytime_tostr; pattern date.!=(v:date,w:date):bit address CMDvarNE; @@ -37838,13 +37838,13 @@ command date.date(s:date):date address MTIMEdate_date; comment Noop routine. -command date.#fromstr():date +command date.#fromstr():void address date_fromstr; pattern date.isnil(v:date):bit address CMDvarISNIL; comment Nil test for date value -command date.#tostr():str +command date.#tostr():void address date_tostr; command factories.getDeparture():bat[:oid,:timestamp] address FCTgetDeparture; @@ -38364,7 +38364,7 @@ command inet.broadcast(X_1:inet):inet address INETbroadcast; comment Returns the broadcast address for network -command inet.#cmp():int +command inet.#cmp():void address INETcompare; command inet.#fromstr():void address INETfromString; @@ -38398,7 +38398,7 @@ command inet.new(s:str):inet address INETnew; comment Create an inet from a string literal -command inet.#null():inet +command inet.#null():void address INETnull; command inet.setmasklen(X_1:inet,X_2:int):inet address INETsetmasklen; @@ -38562,7 +38562,7 @@ command json.filter(name:json,pathexpr:s address JSONfilter; comment Filter all members of an object by a path expression, returning an array.Non-matching elements are skipped. -command json.#fromstr():json +command json.#fromstr():void address JSONfromString; comment Validate a string to be JSON compliant. A NOOP if valid json, NULL otherwise. @@ -38644,7 +38644,7 @@ command json.text(j:json):str address JSONjson2text; comment Convert JSON values to their plain string equivalent. -command json.#tostr():str +command json.#tostr():void address JSONtoString; comment Convert JSON to its string equivalent. Dealing with escape characters @@ -39034,19 +39034,19 @@ pattern mal.manifold(mod:str,fcn:str,a:a address MANIFOLDevaluate; pattern mal.multiplex(mod:str,fcn:str,a:any...):any... address MANIFOLDremapMultiplex; -command mbr.#cmp():int +command mbr.#cmp():void address mbrCOMP; -command mbr.#fromstr():mbr +command mbr.#fromstr():void address mbrFROMSTR; -command mbr.#hash():int +command mbr.#hash():vo
MonetDB: mosaic - Merge with default branch.
Changeset: 93b0231f8435 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=93b0231f8435 Modified Files: geom/monetdb5/geom.mal monetdb5/mal/mal_parser.c monetdb5/modules/atoms/color.mal monetdb5/modules/atoms/inet.mal monetdb5/modules/atoms/json.mal monetdb5/modules/atoms/mtime.mal monetdb5/modules/atoms/url.mal monetdb5/modules/atoms/uuid.mal monetdb5/modules/atoms/xml.mal testing/malcheck.py Branch: mosaic Log Message: Merge with default branch. diffs (truncated from 439 to 300 lines): diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal --- a/geom/monetdb5/geom.mal +++ b/geom/monetdb5/geom.mal @@ -9,30 +9,30 @@ module geom; # @' overwrite lng needed for fixed size! Sizes are fixed in geom.prelude atom mbr:lng; -command tostr() :str address mbrTOSTR; -command fromstr() :mbr address mbrFROMSTR; -command hash() :intaddress mbrHASH; -command null() :intaddress mbrNULL; -command cmp() :int address mbrCOMP; +command tostr()address mbrTOSTR; +command fromstr() address mbrFROMSTR; +command hash() address mbrHASH; +command null() address mbrNULL; +command cmp() address mbrCOMP; command read() address mbrREAD; command write()address mbrWRITE; -command mbr(v:str) :mbr address mbrFromString; +command mbr(v:str) :mbraddress mbrFromString; atom wkb; -command tostr() :str address wkbTOSTR; -command fromstr() :wkb address wkbFROMSTR; -command hash() :intaddress wkbHASH; -command null() :intaddress wkbNULL; -command cmp() :int address wkbCOMP; +command tostr()address wkbTOSTR; +command fromstr() address wkbFROMSTR; +command hash() address wkbHASH; +command null() address wkbNULL; +command cmp() address wkbCOMP; command read() address wkbREAD; command write()address wkbWRITE; -command put() :int address wkbPUT; -command del() :int address wkbDEL; -command length() :int address wkbLENGTH; -command heap() :intaddress wkbHEAP; +command put() address wkbPUT; +command del() address wkbDEL; +command length() address wkbLENGTH; +command heap() address wkbHEAP; command wkb{unsafe}(v:str) :wkb address wkbFromString; command FromText{unsafe}(w:str, type:int) :wkb address wkbFromText; diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c --- a/monetdb5/mal/mal_parser.c +++ b/monetdb5/mal/mal_parser.c @@ -629,7 +629,7 @@ handleInts: * The type variable are defined within the context of a function * scope. * Additional information, such as a repetition factor, - * encoding tables, or type dependency should be modelled as properties. + * encoding tables, or type dependency should be modeled as properties. */ static int typeAlias(Client cntxt, int tpe) diff --git a/monetdb5/modules/atoms/color.mal b/monetdb5/modules/atoms/color.mal --- a/monetdb5/modules/atoms/color.mal +++ b/monetdb5/modules/atoms/color.mal @@ -8,8 +8,8 @@ module color; atom color:int; -command tostr():str address color_tostr; -command fromstr():color address color_fromstr; +command tostr() address color_tostr; +command fromstr() address color_fromstr; command str(s:color):str address CLRstr diff --git a/monetdb5/modules/atoms/inet.mal b/monetdb5/modules/atoms/inet.mal --- a/monetdb5/modules/atoms/inet.mal +++ b/monetdb5/modules/atoms/inet.mal @@ -6,9 +6,9 @@ atom inet:lng; -command null() :inet +command null() address INETnull; -command cmp() :int +command cmp() address INETcompare; command fromstr() address INETfromString diff --git a/monetdb5/modules/atoms/json.mal b/monetdb5/modules/atoms/json.mal --- a/monetdb5/modules/atoms/json.mal +++ b/monetdb5/modules/atoms/json.mal @@ -6,11 +6,11 @@ atom json:str; -command fromstr():json +command fromstr() address JSONfromString comment "Validate a string to be JSON compliant. A NOOP if valid json, NULL otherwise."; -command tostr():str +command tostr() address JSONtoString comment "Convert JSON to its string equivalent. Dealing with escape characters"; diff --git a/monetdb5/modules/atoms/mtime.mal b/monetdb5/modules/atoms/mtime.mal --- a/monetdb5/modules/atoms/mtime.mal +++ b/monetdb5/modules/atoms/mtime.mal @@ -40,9 +40,9 @@ command date(s:date):date address MTIMEdate_date comment "Noop routine."; -command fromstr() :date +command fromstr() address date_fromstr; -command tostr() :str +command tostr() address date_tostr; @@ -106,9 +106,9 @@ comment "Equality of two dates"; #SEP = '.' or ':' # @end verbatim atom daytime :int; -command fromstr(
MonetDB: mosaic - Merge with default branch.
Changeset: 6fdc2b26e9ed for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6fdc2b26e9ed Removed Files: clients/Tests/SQL-dump.stable.out.oid32 clients/Tests/SQL-dump.stable.out.oid32.int128 Modified Files: .hgtags clients/Tests/All configure.ag gdk/gdk_atomic.h gdk/gdk_utils.c testing/Mtest.py.in Branch: mosaic Log Message: Merge with default branch. diffs (truncated from 18546 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -589,3 +589,5 @@ 6607367487d91eb02c5eb7dfb9d96606f8f7c6f0 e3d0eecdc35dc633fdd89157ba704f60f03756c1 Oct2014_9 d98df578687e677ae3abbc0ba41e3bb0631ef08a Oct2014_SP2_release c80c3439c5d7b2bddb710e584eb0936adc21d462 MonetDB.R-0.9.6 +0529873485e7ec8e4c723f8bf7fc14020a7390b2 Oct2014_11 +f59ba5dedd0122403ab175cd1d44a88ab6b3be02 Oct2014_SP3_release diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,4 +1,4 @@ exports HAVE_NETCDF&HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures -HAVE_NETCDF&HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!BITS32?SQL-dump +HAVE_NETCDF&HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!BITS32&!BITS64OID32?SQL-dump MERCURIAL?malcheck diff --git a/clients/Tests/SQL-dump.stable.out.oid32 b/clients/Tests/SQL-dump.stable.out.oid32 deleted file mode 100644 --- a/clients/Tests/SQL-dump.stable.out.oid32 +++ /dev/null @@ -1,8769 +0,0 @@ -stdout of test 'SQL-dump` in directory 'clients` itself: - - -# 15:01:36 > -# 15:01:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34237" "--set" "mapi_usock=/var/tmp/mtest-13451/.s.monetdb.34237" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients" "--set" "mal_listing=0" -# 15:01:36 > - -# MonetDB 5 server v11.17.0 (hg id: 51cced809df4) -# This is an unreleased version -# Serving database 'mTests_clients', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 15.591 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:34237/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-13451/.s.monetdb.34237 -# MonetDB/GIS module loaded -# MonetDB/JAQL module loaded -# MonetDB/SQL module loaded - -Ready. -# SQL catalog created, loading sql scripts once -# loading sql script: 09_like.sql -# loading sql script: 10_math.sql -# loading sql script: 11_times.sql -# loading sql script: 12_url.sql -# loading sql script: 13_date.sql -# loading sql script: 14_inet.sql -# loading sql script: 15_querylog.sql -# loading sql script: 16_tracelog.sql -# loading sql script: 17_compress.sql -# loading sql script: 18_dictionary.sql -# loading sql script: 19_cluster.sql -# loading sql script: 20_vacuum.sql -# loading sql script: 21_dependency_functions.sql -# loading sql script: 22_clients.sql -# loading sql script: 23_skyserver.sql -# loading sql script: 24_zorder.sql -# loading sql script: 25_debug.sql -# loading sql script: 26_sysmon.sql -# loading sql script: 39_analytics.sql -# loading sql script: 40_geom.sql -# loading sql script: 40_json.sql -# loading sql script: 41_md5sum.sql -# loading sql script: 45_uuid.sql -# loading sql script: 46_gsl.sql -# loading sql script: 75_storagemodel.sql -# loading sql script: 80_statistics.sql -# loading sql script: 80_udf.sql -# loading sql script: 99_system.sql - -# 15:19:38 > -# 15:19:38 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-517" "--port=32251" -# 15:19:38 > - -SYSTEM SCHEMA bam -SYSTEM SCHEMA json -SYSTEM SCHEMA sys -SYSTEM SCHEMA tmp -SYSTEM TABLE sys._columns -SYSTEM TABLE sys._tables -SYSTEM TABLE sys.args -SYSTEM TABLE sys.auths -SYSTEM TABLE sys.connections -SYSTEM TABLE sys.db_user_info -SYSTEM TABLE sys.dependencies -SYSTEM TABLE sys.functions -SYSTEM TABLE sys.idxs -SYSTEM TABLE sys.keys -SYSTEM TABLE sys.netcdf_attrs -SYSTEM TABLE sys.netcdf_dims -SYSTEM TABLE sys.netcdf_files -SYSTEM TABLE sys.netcdf_vardim -SYSTEM TABLE sys.netcdf_vars -SYSTEM TABLE sys.objects -SYSTEM TABLE sys.privileges -SYSTEM TABLE sys.schemas -SYSTEM TABLE sys.sequences -SYSTEM TABLE sys.statistics -SYSTEM TABLE sys.storagemodelinput -SYSTEM TABLE sys.systemfunctions -SYSTEM TABLE sys.triggers -SYSTEM TABLE sys.types -SYSTEM TABLE sys.user_role -SYSTEM VIEW sys.columns -SYSTEM VIEW sys.environment -SYSTEM VIEW sys.optimizers -SYSTEM VIEW sys.querylog_calls -SYSTEM VIEW sys.querylog_catalog -SYSTEM VIEW sys.querylog_history -SYSTEM VIEW sys.queue -SYSTEM VIEW sys.sessions -SYSTEM VIEW sys.storage -SYSTEM VIEW sys.storagemodel -SYSTEM VIEW