MonetDB: ipv6 - Merge with default branch.
Changeset: eb6ffc053080 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb6ffc053080 Added Files: sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out sql/test/rename/Tests/rename10.sql sql/test/rename/Tests/rename10.stable.err sql/test/rename/Tests/rename10.stable.out Removed Files: sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128 Modified Files: .hgtags MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/R/Tests/All clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog gdk/libbat.rc libversions monetdb5/optimizer/opt_commonTerms.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql_upgrades.c sql/common/sql_types.c sql/include/sql_catalog.h sql/server/rel_optimizer.c sql/server/rel_optimizer.h sql/server/rel_unnest.c sql/server/sql_query.c sql/server/sql_query.h sql/storage/store.c sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out sql/test/BugTracker-2019/Tests/alter_table_set_schema.Bug-6701.stable.out sql/test/BugTracker-2019/Tests/subselect.Bug-6700.stable.out sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/analytics/Tests/analytics09.stable.out sql/test/bugs/Tests/case_cast-bug-sf-1019506.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/pg_regress/Tests/select_views.stable.out sql/test/rename/Tests/All sql/test/rename/Tests/rename09.stable.out sql/test/sql_xml/Tests/xml.stable.out sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/dump.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 vertoo.data Branch: ipv6 Log Message: Merge with default branch. diffs (truncated from 142963 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -722,3 +722,6 @@ a4e8c9372aa244d6a18c3ef8f1513905650d812c 8db7bfce6045f2ad86d5898946d3e712495c96a3 Apr2019_root 643dfa328c71d7891c8358b4969aa9ebf81e0f4c Apr2019_1 643dfa328c71d7891c8358b4969aa9ebf81e0f4c Apr2019_release +2c9089e1dde297caaf347bf27f88b10e5622a735 Apr2019_3 +643dfa328c71d7891c8358b4969aa9ebf81e0f4c Apr2019_release +2c9089e1dde297caaf347bf27f88b10e5622a735 Apr2019_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1060,6 +1060,11 @@ done %postun -p /sbin/ldconfig %changelog +* Fri Apr 26 2019 Sjoerd Mullender - 11.33.3-20190426 +- Rebuilt. +- BZ#6647: Add suport to Python 3 on Windows +- BZ#6696: Re-use of MAL explain plans with complex type coercions + * Fri Apr 05 2019 Sjoerd Mullender - 11.33.1-20190405 - Rebuilt. - BZ#2403: stream: http read support in streams diff --git a/clients/R/Tests/All b/clients/R/Tests/All --- a/clients/R/Tests/All +++ b/clients/R/Tests/All @@ -3,6 +3,6 @@ HAVE_LIBR?install HAVE_LIBR?deps-test HAVE_LIBR?dbi #HAVE_LIBR?dplyr too slow -HAVE_LIBR?dplyr-flights +#HAVE_LIBR?dplyr-flights they keep changing this HAVE_LIBR?copy_into_fwf HAVE_LIBR_WIN32?dbapply diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@
MonetDB: ipv6 - Merge with default.
Changeset: 5415fc486341 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5415fc486341 Added Files: monetdb5/modules/atoms/mtime_private.h monetdb5/optimizer/Tests/commonTerms.stable.err monetdb5/optimizer/Tests/commonTerms.stable.out sql/include/sql_querytype.h sql/server/rel_unnest.c sql/server/rel_unnest.h sql/server/sql_query.c sql/server/sql_query.h sql/storage/bat/nop_logger.c sql/storage/bat/nop_logger.h sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.stable.err sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.stable.out sql/test/BugTracker-2019/Tests/alter_table_set_schema.Bug-6701.sql sql/test/BugTracker-2019/Tests/alter_table_set_schema.Bug-6701.stable.err sql/test/BugTracker-2019/Tests/alter_table_set_schema.Bug-6701.stable.out sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.sql sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.err sql/test/BugTracker-2019/Tests/subselect.Bug-6700.sql sql/test/BugTracker-2019/Tests/subselect.Bug-6700.stable.err sql/test/BugTracker-2019/Tests/subselect.Bug-6700.stable.out sql/test/rename/Tests/rename09.sql sql/test/rename/Tests/rename09.stable.err sql/test/rename/Tests/rename09.stable.out sql/test/subquery/Tests/All sql/test/subquery/Tests/all.stable.err sql/test/subquery/Tests/all.stable.out sql/test/subquery/Tests/any.stable.err sql/test/subquery/Tests/any.stable.out sql/test/subquery/Tests/any_all.stable.err sql/test/subquery/Tests/any_all.stable.out sql/test/subquery/Tests/correlated.sql sql/test/subquery/Tests/correlated.stable.err sql/test/subquery/Tests/correlated.stable.out sql/test/subquery/Tests/scalar.stable.err sql/test/subquery/Tests/scalar.stable.out sql/test/subquery/Tests/subquery.sql sql/test/subquery/Tests/subquery.stable.err sql/test/subquery/Tests/subquery.stable.out sql/test/subquery/Tests/subquery2.sql sql/test/subquery/Tests/subquery2.stable.err sql/test/subquery/Tests/subquery2.stable.out Removed Files: sql/include/sql_query.h Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out gdk/ChangeLog gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc.h gdk/gdk_group.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_storage.c gdk/gdk_utils.c monetdb5/ChangeLog monetdb5/mal/Tests/tst1200.stable.out monetdb5/mal/Tests/tst1202.stable.out monetdb5/mal/mal_authorize.c monetdb5/modules/atoms/Makefile.ag monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/atoms/mtime_analytic.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/modules/mal/00_batcalc_hge.mal.sh monetdb5/modules/mal/00_calc_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/wlc.mal monetdb5/optimizer/Tests/argumenttypes.stable.err monetdb5/optimizer/Tests/commonTerms.malC monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h sql/backends/monet5/Makefile.ag sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_bat2time.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_rank.mal sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/backends/monet5/sqlcatalog.mal 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.mal sql/benchmarks/tpcds/Tests/09.stable.out sql/common/sql_changeset.c sql/common/sql_stack.c
MonetDB: ipv6 - Merge with default.
Changeset: bf9c2a1d385f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bf9c2a1d385f Added Files: sql/test/BugTracker-2018/Tests/truncate_geom_tables.Bug-6543.sql sql/test/BugTracker-2018/Tests/truncate_geom_tables.Bug-6543.stable.err sql/test/BugTracker-2018/Tests/truncate_geom_tables.Bug-6543.stable.out sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.stable.out sql/test/BugTracker-2019/Tests/subselect-count.Bug-6686.sql sql/test/BugTracker-2019/Tests/subselect-count.Bug-6686.stable.err sql/test/BugTracker-2019/Tests/subselect-count.Bug-6686.stable.out sql/test/merge-partitions/Tests/mergepart29.py sql/test/merge-partitions/Tests/mergepart29.stable.err sql/test/merge-partitions/Tests/mergepart29.stable.out Removed Files: sql/test/BugTracker-2016/Tests/querylog.stable.err sql/test/BugTracker-2016/Tests/querylog.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 Modified Files: MonetDB.spec clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/dump.c clients/mapiclient/mhelp.c clients/mapilib/mapi.c clients/odbc/driver/ODBCConvert.c clients/odbc/driver/ODBCDesc.h clients/odbc/driver/ODBCUtil.c clients/odbc/driver/README clients/odbc/driver/SQLFetch.c clients/odbc/driver/SQLGetInfo.c clients/odbc/driver/SQLParamData.c clients/odbc/driver/SQLPutData.c common/stream/stream.c configure.ag gdk/gdk.h gdk/gdk_atomic.h gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_hash.c gdk/gdk_hash.h gdk/gdk_imprints.c gdk/gdk_orderidx.c gdk/gdk_posix.h gdk/gdk_private.h gdk/gdk_sample.c gdk/gdk_storage.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_utils.c gdk/gdk_utils.h monetdb5/NT/M5server.bat 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/rapi/rapi.c monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_private.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_readline.c monetdb5/mal/mal_resource.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_scenario.c monetdb5/mal/mal_scenario.h monetdb5/mal/mal_session.c monetdb5/mal/mal_session.h monetdb5/modules/atoms/xml.c monetdb5/modules/kernel/mmath.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tablet.h monetdb5/modules/mal/wlc.c monetdb5/modules/mal/wlc.mal monetdb5/optimizer/Tests/inlineFunction.malC monetdb5/optimizer/Tests/inlineFunction.stable.out monetdb5/optimizer/Tests/inlineFunction1.malC monetdb5/optimizer/Tests/inlineFunction1.stable.out monetdb5/optimizer/Tests/inlineFunction4.malC monetdb5/optimizer/Tests/inlineFunction4.stable.out monetdb5/optimizer/opt_aliases.c monetdb5/optimizer/opt_coercion.c monetdb5/optimizer/opt_commonTerms.c monetdb5/optimizer/opt_garbageCollector.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_remap.c monetdb5/optimizer/optimizer.c monetdb5/optimizer/optimizer_private.h sql/ChangeLog.Apr2019 sql/backends/monet5/UDF/capi/capi.c sql/backends/monet5/UDF/pyapi/pyapi.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_gencode.h sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/lidar/lidar.c sql/backends/monet5/vaults/lidar/lidar.h sql/backends/monet5/vaults/lidar/lidar.mal sql/backends/monet5/wlr.c sql/common/sql_list.c sql/scripts/15_querylog.sql sql/server/rel_optimizer.c sql/server/rel_propagate.c sql/server/rel_schema.c sql/server/rel_updates.c sql/server/sql_mvc.c sql/server/sql_parser.y sql/server/sql_partition.c sql/server/sql_privileges.c sql/server/sql_scan.c sql/storage/bat/bat_storage.c sql/storage/sql_catalog.c
MonetDB: ipv6 - Merge with default.
Changeset: 400cb105fa55 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=400cb105fa55 Added Files: sql/test/BugTracker-2019/Tests/All sql/test/BugTracker-2019/Tests/copy-into-from-stdin-empty-line.Bug-6669.sql sql/test/BugTracker-2019/Tests/copy-into-from-stdin-empty-line.Bug-6669.stable.err sql/test/BugTracker-2019/Tests/copy-into-from-stdin-empty-line.Bug-6669.stable.out sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.sql sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.stable.err sql/test/BugTracker-2019/Tests/subselect-contradiction.Bug-6683.sql sql/test/BugTracker-2019/Tests/subselect-contradiction.Bug-6683.stable.err sql/test/BugTracker-2019/Tests/subselect-contradiction.Bug-6683.stable.out sql/test/in-value-list/Tests/All sql/test/in-value-list/Tests/various-in-value-list-queries.sql sql/test/in-value-list/Tests/various-in-value-list-queries.stable.err sql/test/in-value-list/Tests/various-in-value-list-queries.stable.out Removed Files: sql/backends/monet5/prog.c Modified Files: ChangeLog MonetDB.spec NT/rules.msc buildtools/selinux/monetdb.te clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/ReadlineTools.c clients/mapiclient/dotmonetdb.c clients/mapiclient/dump.c clients/mapiclient/mclient.1 clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/mapiclient/msqldump.c clients/mapiclient/msqldump.h clients/mapilib/mapi.c clients/odbc/driver/ODBCUtil.h clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driver/SQLConnect.c clients/odbc/driver/SQLForeignKeys.c clients/odbc/driver/SQLPrimaryKeys.c clients/odbc/driver/SQLProcedureColumns.c clients/odbc/driver/SQLProcedures.c clients/odbc/driver/SQLSpecialColumns.c clients/odbc/driver/SQLStatistics.c clients/odbc/driver/SQLTablePrivileges.c clients/odbc/driver/SQLTables.c common/options/monet_options.c common/stream/stream.c common/utils/Makefile.ag common/utils/mcrypt.c configure.ag gdk/ChangeLog gdk/ChangeLog.Apr2019 gdk/Makefile.ag gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_atomic.h gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_bbp.h gdk/gdk_calc.c gdk/gdk_calc_private.h gdk/gdk_delta.c gdk/gdk_firstn.c gdk/gdk_group.c gdk/gdk_hash.c gdk/gdk_hash.h 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_private.h gdk/gdk_qsort.c gdk/gdk_qsort_impl.h gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_system_private.h gdk/gdk_tm.c gdk/gdk_utils.c gdk/gdk_utils.h gdk/gdk_value.c geom/monetdb5/geom.c geom/monetdb5/geom.h monetdb5/ChangeLog.Apr2019 monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/extras/rapi/converters.c.h 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_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_instruction.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_linker.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_namespace.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_session.c monetdb5/modules/atoms/Makefile.ag monetdb5/modules/atoms/batxml.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
MonetDB: ipv6 - Merge with default
Changeset: 0c7bbd303f84 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c7bbd303f84 Added Files: geom/sql/pg_regression/Tests/removeTmpFiles.SQL.py Removed Files: geom/sql/pg_regression/Tests/removeTmpFiles.SQL.py.in monetdb5/extras/rapi/Tests/rapi06.malC monetdb5/extras/rapi/Tests/rapi06.stable.err monetdb5/extras/rapi/Tests/rapi06.stable.out sql/backends/monet5/Tests/rapi04.sql sql/backends/monet5/Tests/rapi04.stable.err sql/backends/monet5/Tests/rapi04.stable.out Modified Files: clients/Tests/exports.stable.out clients/mapiclient/mhelp.c clients/mapilib/mapi.c clients/mapilib/mapi.h clients/odbc/driver/SQLConnect.c common/stream/stream.c common/utils/msabaoth.c gdk/gdk.h gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_group.c gdk/gdk_interprocess.c gdk/gdk_interprocess.h gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_private.h gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_tm.c gdk/gdk_unique.c gdk/gdk_utils.c geom/lib/libgeom.c geom/lib/libgeom.h geom/monetdb5/geom.c monetdb5/NT/M5server.bat monetdb5/extras/rapi/Tests/All monetdb5/mal/mal.c monetdb5/mal/mal_authorize.c monetdb5/mal/mal_profiler.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/atoms/mtime_analytic.c monetdb5/modules/atoms/streams.c monetdb5/modules/atoms/uuid.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/bat5.h monetdb5/modules/kernel/status.c monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/tablet.c rpm.mk.in sql/ChangeLog.Apr2019 sql/backends/monet5/Tests/All sql/backends/monet5/UDF/capi/capi.c sql/backends/monet5/UDF/pyapi/pyapi.c sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat sql/backends/monet5/generator/generator.c sql/backends/monet5/sql.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_statistics.h sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/lidar/lidar.c sql/common/sql_types.c sql/common/sql_types.h sql/scripts/26_sysmon.sql sql/server/rel_optimizer.c sql/server/rel_optimizer.h sql/server/sql_mvc.c sql/server/sql_mvc.h sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_utils.c sql/storage/bat/bat_utils.h sql/storage/store.c sql/test/BugTracker-2015/Tests/name_conflict.Bug-3650.sql sql/test/BugTracker-2015/Tests/name_conflict.Bug-3650.stable.err sql/test/BugTracker-2016/Tests/column_name_conflict.Bug-3912.sql sql/test/BugTracker-2016/Tests/column_name_conflict.Bug-3912.stable.err sql/test/BugTracker-2016/Tests/column_name_conflict.Bug-3912.stable.out sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.sql sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/pg_regress/Tests/float4.sql sql/test/pg_regress/Tests/float4.stable.err sql/test/pg_regress/Tests/float4.stable.out sql/test/pg_regress/Tests/float8.sql sql/test/pg_regress/Tests/float8.stable.out sql/test/pg_regress/Tests/float8.stable.out.Windows
MonetDB: ipv6 - Merge with default.
Changeset: 700f4bbd0aea for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=700f4bbd0aea Added Files: monetdb5/modules/kernel/mmath_private.h sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat Removed Files: sql/backends/monet5/UDF/pyapi/pyapi_locatepython.bat sql/test/BugTracker-2009/drop_history.sql sql/test/BugTracker-2009/set_history_and_drop_table.SF-2607045.sql sql/test/BugTracker-2011/Tests/history.Bug-2909.sql sql/test/BugTracker-2011/Tests/history.Bug-2909.stable.err sql/test/BugTracker-2011/Tests/history.Bug-2909.stable.out Modified Files: NT/mksqlwxs.py NT/rules.msc clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out common/stream/stream.c common/utils/mutils.h configure.ag gdk/gdk_bbp.c gdk/gdk_storage.c gdk/gdk_utils.c monetdb5/ChangeLog.Apr2019 monetdb5/NT/M5server.bat monetdb5/extras/rapi/rapi.c monetdb5/mal/Tests/tst016.malC monetdb5/mal/Tests/tst016.stable.out monetdb5/mal/mal_linker.c monetdb5/mal/mal_profiler.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/blob.h monetdb5/modules/atoms/blob.mal monetdb5/modules/kernel/Makefile.ag monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/batmmath.h monetdb5/modules/kernel/batmmath.mal monetdb5/modules/kernel/mmath.c monetdb5/modules/kernel/mmath.h monetdb5/modules/kernel/mmath.mal 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/sysmon.c sql/ChangeLog.Apr2019 sql/backends/monet5/UDF/capi/capi.c sql/backends/monet5/UDF/pyapi/Makefile.ag sql/backends/monet5/UDF/pyapi/conversion.c sql/backends/monet5/UDF/pyapi/emit.c sql/backends/monet5/UDF/pyapi/pyheader.h sql/backends/monet5/UDF/pyapi/pytypes.c sql/backends/monet5/UDF/pyapi/type_conversion.c sql/backends/monet5/UDF/pyapi3/Makefile.ag sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/fits/fits.c sql/common/sql_types.c sql/scripts/51_sys_schema_extension.sql sql/server/rel_exp.c sql/server/rel_sequence.c sql/server/sql_env.c sql/server/sql_mvc.c sql/server/sql_mvc.h sql/storage/sql_storage.h sql/storage/store.c sql/test/BugTracker-2011/Tests/All sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.sql sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out sql/test/sys-schema/Tests/check_Not_Nullable_columns.sql sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.out sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
MonetDB: ipv6 - Merge with default.
Changeset: 6bc6f09d1529 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6bc6f09d1529
Added Files:
ChangeLog.Apr2019
buildtools/ChangeLog.Apr2019
clients/ChangeLog.Apr2019
clients/mapilib/ChangeLog.Apr2019
common/stream/ChangeLog.Apr2019
gdk/ChangeLog.Apr2019
geom/ChangeLog.Apr2019
monetdb5/ChangeLog.Apr2019
sql/ChangeLog.Apr2019
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/sys-schema/Tests/check_MaxStrLength_violations.sql
sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.err
sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.out
sql/test/sys-schema/Tests/netcdf_tables_checks.sql
sql/test/sys-schema/Tests/netcdf_tables_checks.stable.err
sql/test/sys-schema/Tests/netcdf_tables_checks.stable.out
sql/test/sys-schema/Tests/update_statistics.sql
sql/test/sys-schema/Tests/update_statistics.stable.err
sql/test/sys-schema/Tests/update_statistics.stable.out
testing/ChangeLog.Apr2019
tools/merovingian/ChangeLog.Apr2019
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog
clients/ChangeLog
clients/mapilib/ChangeLog
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
common/stream/ChangeLog
configure.ag
gdk/ChangeLog
gdk/libbat.rc
monetdb5/ChangeLog
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
sql/backends/monet5/sql_upgrades.c
sql/server/sql_mvc.c
sql/storage/store.c
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.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/sys-schema/Tests/All
sql/test/sys-schema/Tests/bam_tables_checks.sql
sql/test/sys-schema/Tests/bam_tables_checks.stable.out
sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.sql
sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
sql/test/sys-schema/Tests/check_Not_Nullable_columns.sql
sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.out
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
sql/test/sys-schema/Tests/geom_tables_checks.sql
sql/test/sys-schema/Tests/geom_tables_checks.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
vertoo.data
Branch: ipv6
Log Message:
Merge with default.
diffs (truncated from 78003 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -719,3 +719,4 @@ a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d
24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_SP1_release
a4e8c9372aa244d6a18c3ef8f1513905650d812c Aug2018_13
a4e8c9372aa244d6a18c3ef8f1513905650d812c Aug2018_SP2_release
+8db7bfce6045f2ad86d5898946d3e712495c96a3 Apr2019_root
diff --git a/ChangeLog b/ChangeLog.Apr2019
copy from ChangeLog
copy to ChangeLog.Apr2019
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.32.0
+%global version 11.34.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
---
MonetDB: ipv6 - Merge with default.
Changeset: f7523ab43844 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7523ab43844
Modified Files:
gdk/gdk_logger.c
Branch: ipv6
Log Message:
Merge with default.
diffs (178 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1030,7 +1030,7 @@ logger_readlog(logger *lg, char *filenam
while (err == LOG_OK && log_read_format(lg, )) {
char *name = NULL;
char tpe;
- oid id;
+ oid id;
t1 = time(NULL);
if (t1 - t0 > 10) {
@@ -1124,7 +1124,7 @@ logger_readlog(logger *lg, char *filenam
break;
case LOG_CREATE_ID:
l.flag = LOG_CREATE;
- if (tr == NULL || log_read_id(lg, , ) != LOG_OK)
+ if (tr == NULL || log_read_id(lg, , ) != LOG_OK)
err = LOG_EOF;
else
err = log_read_create(lg, tr, name, tpe, id);
@@ -1137,7 +1137,7 @@ logger_readlog(logger *lg, char *filenam
break;
case LOG_USE_ID:
l.flag = LOG_USE;
- if (tr == NULL || log_read_id(lg, , ) != LOG_OK)
+ if (tr == NULL || log_read_id(lg, , ) != LOG_OK)
err = LOG_EOF;
else
err = log_read_use(lg, tr, , name, tpe, id);
@@ -1150,7 +1150,7 @@ logger_readlog(logger *lg, char *filenam
break;
case LOG_DESTROY_ID:
l.flag = LOG_DESTROY;
- if (tr == NULL || log_read_id(lg, , ) != LOG_OK)
+ if (tr == NULL || log_read_id(lg, , ) != LOG_OK)
err = LOG_EOF;
else
err = log_read_destroy(lg, tr, name, tpe, id);
@@ -1163,7 +1163,7 @@ logger_readlog(logger *lg, char *filenam
break;
case LOG_CLEAR_ID:
l.flag = LOG_CLEAR;
- if (tr == NULL || log_read_id(lg, , ) != LOG_OK)
+ if (tr == NULL || log_read_id(lg, , ) != LOG_OK)
err = LOG_EOF;
else
err = log_read_clear(lg, tr, name, tpe, id);
@@ -1433,7 +1433,7 @@ bm_subcommit(logger *lg, BAT *list_bid,
if (logger_switch_bat(catalog_bid, bids, lg->fn, "catalog_bid")
!= GDK_SUCCEED ||
logger_switch_bat(catalog_nme, nmes, lg->fn, "catalog_nme")
!= GDK_SUCCEED ||
- logger_switch_bat(catalog_tpe, tpes, lg->fn, "catalog_tpe")
!= GDK_SUCCEED ||
+ logger_switch_bat(catalog_tpe, tpes, lg->fn, "catalog_tpe")
!= GDK_SUCCEED ||
logger_switch_bat(catalog_oid, oids, lg->fn, "catalog_oid")
!= GDK_SUCCEED) {
logbat_destroy(bids);
logbat_destroy(nmes);
@@ -1480,7 +1480,7 @@ bm_subcommit(logger *lg, BAT *list_bid,
}
if (BATappend(ids, lg->seqs_id, tids, true) != GDK_SUCCEED ||
- BATappend(vals, lg->seqs_val, tids, true) != GDK_SUCCEED) {
+ BATappend(vals, lg->seqs_val, tids, true) != GDK_SUCCEED) {
logbat_destroy(tids);
logbat_destroy(ids);
logbat_destroy(vals);
@@ -1726,7 +1726,7 @@ logger_load(int debug, const char *fn, c
}
for(i=0;iwith_ids = false;
@@ -1749,7 +1749,7 @@ logger_load(int debug, const char *fn, c
}
for(i=0;iwith_ids = false;
@@ -1835,8 +1835,7 @@ logger_load(int debug, const char *fn, c
if (lg->snapshots_bid == NULL ||
lg->snapshots_tid == NULL ||
lg->dsnapshots == NULL) {
- GDKerror("Logger_new: failed to create snapshots "
-"bats");
+ GDKerror("Logger_new: failed to create snapshots bats");
goto error;
}
@@ -1993,7 +1992,6 @@ logger_load(int debug, const char *fn, c
{
FILE *fp1;
- fpos_t off;
int curid;
snprintf(cvfile, sizeof(cvfile), "%sconvert-nil-nan",
@@ -2001,12 +1999,27 @@ logger_load(int debug, const char *fn, c
snprintf(bak, sizeof(bak), "%s_nil-nan-convert", fn);
/* read the current log id without disturbing
* the file pointer */
+#ifdef _MSC_VER
+ /* work around bug in Visual Studio runtime:
+
