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_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_linker.h monetdb5/mal/mal_listing.c monetdb5/mal/mal_module.c monetdb5/mal/mal_module.h monetdb5/mal/mal_parser.c monetdb5/mal/mal_private.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_readline.c monetdb5/mal/mal_resolve.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_scenario.c monetdb5/mal/mal_session.c monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/str.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/microbenchmark.c monetdb5/modules/kernel/status.c monetdb5/modules/mal/Makefile.ag monetdb5/modules/mal/Tests/All monetdb5/modules/mal/bbp.c monetdb5/modules/mal/bbp.h monetdb5/modules/mal/bbp.mal monetdb5/modules/mal/clients.c monetdb5/modules/mal/clients.h monetdb5/modules/mal/clients.mal monetdb5/modules/mal/inspect.c monetdb5/modules/mal/mal_init.mal monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/manual.c monetdb5/modules/mal/manual.h monetdb5/modules/mal/manual.mal monetdb5/modules/mal/mdb.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/tablet.c monetdb5/optimizer/Tests/inlineFunction.stable.out monetdb5/optimizer/Tests/inlineFunction1.stable.out monetdb5/optimizer/Tests/inlineFunction3.stable.out monetdb5/optimizer/Tests/inlineFunction4.stable.out monetdb5/optimizer/opt_aliases.h monetdb5/optimizer/opt_candidates.h monetdb5/optimizer/opt_coercion.h monetdb5/optimizer/opt_commonTerms.c monetdb5/optimizer/opt_commonTerms.h monetdb5/optimizer/opt_constants.c monetdb5/optimizer/opt_constants.h monetdb5/optimizer/opt_costModel.h monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_dataflow.h monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_deadcode.h monetdb5/optimizer/opt_evaluate.c monetdb5/optimizer/opt_evaluate.h monetdb5/optimizer/opt_factorize.h monetdb5/optimizer/opt_garbageCollector.c monetdb5/optimizer/opt_garbageCollector.h monetdb5/optimizer/opt_generator.c monetdb5/optimizer/opt_generator.h monetdb5/optimizer/opt_inline.c monetdb5/optimizer/opt_inline.h monetdb5/optimizer/opt_json.h monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_macro.h monetdb5/optimizer/opt_matpack.h monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mergetable.h monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_mitosis.h monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_multiplex.h monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_profiler.h monetdb5/optimizer/opt_projectionpath.c monetdb5/optimizer/opt_projectionpath.h monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_pushselect.h monetdb5/optimizer/opt_querylog.h monetdb5/optimizer/opt_reduce.h monetdb5/optimizer/opt_remap.c monetdb5/optimizer/opt_remap.h monetdb5/optimizer/opt_remoteQueries.c monetdb5/optimizer/opt_remoteQueries.h monetdb5/optimizer/opt_reorder.c monetdb5/optimizer/opt_reorder.h monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_support.h monetdb5/optimizer/opt_volcano.h monetdb5/tools/Makefile.ag rpm.mk.in sql/ChangeLog sql/backends/monet5/40_sql.mal sql/backends/monet5/LSST/80_lsst.mal sql/backends/monet5/Makefile.ag sql/backends/monet5/Tests/All sql/backends/monet5/Tests/pyapi30.stable.out sql/backends/monet5/UDF/cudf/80_udf.mal 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/Makefile.ag sql/backends/monet5/UDF/pyapi/connection.c sql/backends/monet5/UDF/pyapi/connection.h sql/backends/monet5/UDF/pyapi/formatinput.c sql/backends/monet5/UDF/pyapi/formatinput.h sql/backends/monet5/UDF/pyapi/pyapi.c sql/backends/monet5/UDF/pyapi/pyapi.h sql/backends/monet5/UDF/pyapi/pyapi.mal sql/backends/monet5/UDF/pyapi/pytypes.h sql/backends/monet5/UDF/pyapi/type_conversion.c sql/backends/monet5/UDF/pyapi/type_conversion.h sql/backends/monet5/generator/90_generator.mal sql/backends/monet5/gsl/73_gsl.mal 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_cast.c sql/backends/monet5/sql_cast_impl_down_from_int.h sql/backends/monet5/sql_cast_impl_up_to_flt.h sql/backends/monet5/sql_cast_impl_up_to_int.h sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_rank.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/backends/monet5/vaults/Makefile.ag sql/backends/monet5/vaults/bam/85_bam.mal sql/backends/monet5/vaults/fits/72_fits.mal sql/backends/monet5/vaults/fits/Makefile.ag sql/backends/monet5/vaults/lidar/75_lidar.mal sql/backends/monet5/vaults/lidar/Makefile.ag sql/backends/monet5/vaults/netcdf/74_netcdf.mal sql/backends/monet5/vaults/netcdf/Makefile.ag sql/backends/monet5/vaults/shp/75_shp.mal sql/backends/monet5/vaults/shp/Makefile.ag 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.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.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.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.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/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/20-explain.stable.out 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 sql/benchmarks/tpch/Tests/22-explain.stable.out.int128 sql/include/sql_catalog.h sql/scripts/25_debug.sql sql/scripts/75_storagemodel.sql sql/scripts/80_statistics.sql sql/scripts/Makefile.ag sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_select.c sql/server/rel_semantic.c sql/server/rel_updates.c sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_parser.h sql/server/sql_parser.y sql/server/sql_scan.c sql/storage/bat/bat_storage.c sql/storage/store.c sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.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/func_iter_vs_bulk.Bug-2826.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-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/All 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/BugTracker-2016/Tests/querylog.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out 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/copy/Tests/All 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.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/check.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.int128 sql/test/emptydb/updatetests sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check0.stable.out.int128 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/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/drop3.stable.out.int128 sql/test/leaks/Tests/select1.stable.out sql/test/leaks/Tests/select1.stable.out.int128 sql/test/leaks/Tests/select2.stable.out sql/test/leaks/Tests/select2.stable.out.int128 sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp1.stable.out.int128 sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp2.stable.out.int128 sql/test/leaks/Tests/temp3.stable.out sql/test/leaks/Tests/temp3.stable.out.int128 sql/test/malloc_fail/Tests/All sql/test/malloc_fail/Tests/setmemorylimit-fail.sql sql/test/malloc_fail/Tests/setmemorylimit-fail.stable.err sql/test/malloc_fail/Tests/setmemorylimit-fail.stable.out sql/test/malloc_fail/Tests/setmemorylimit-fail2.sql sql/test/malloc_fail/Tests/setmemorylimit.sql sql/test/mergetables/Tests/mergequery.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.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.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 testing/Mdiff.c testing/Mtest.py.in tools/mserver/mserver5.c Branch: mosaic Log Message:
Merge with default diffs (truncated from 128048 to 300 lines): diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj b/NT/installer32/MonetDB5-SQL-Installer.vdproj --- a/NT/installer32/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj @@ -897,12 +897,6 @@ } "Entry" { - "MsmKey" = "8:_EC56B031A65A44BCA049E43F5A7641C4" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_F0AD495DD01A481B8FDB22499521AFB7" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -939,12 +933,6 @@ } "Entry" { - "MsmKey" = "8:_F64E69D474DA4F6A89A1B014F77E4669" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_F827A21B394243CA9A2DA27D42DA0C93" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -3964,26 +3952,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EC56B031A65A44BCA049E43F5A7641C4" - { - "SourcePath" = "8:lib\\monetdb5\\zorder.mal" - "TargetName" = "8:zorder.mal" - "Tag" = "8:" - "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F0AD495DD01A481B8FDB22499521AFB7" { "SourcePath" = "8:lib\\monetdb5\\autoload\\01_batcalc.mal" @@ -4104,26 +4072,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F64E69D474DA4F6A89A1B014F77E4669" - { - "SourcePath" = "8:lib\\monetdb5\\createdb\\24_zorder.sql" - "TargetName" = "8:24_zorder.sql" - "Tag" = "8:" - "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F827A21B394243CA9A2DA27D42DA0C93" { "SourcePath" = "8:lib\\libmapi.lib" diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj b/NT/installer64/MonetDB5-SQL-Installer.vdproj --- a/NT/installer64/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj @@ -897,12 +897,6 @@ } "Entry" { - "MsmKey" = "8:_EC56B031A65A44BCA049E43F5A7641C4" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_F0AD495DD01A481B8FDB22499521AFB7" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -939,12 +933,6 @@ } "Entry" { - "MsmKey" = "8:_F64E69D474DA4F6A89A1B014F77E4669" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_F827A21B394243CA9A2DA27D42DA0C93" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -3964,26 +3952,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EC56B031A65A44BCA049E43F5A7641C4" - { - "SourcePath" = "8:lib\\monetdb5\\zorder.mal" - "TargetName" = "8:zorder.mal" - "Tag" = "8:" - "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F0AD495DD01A481B8FDB22499521AFB7" { "SourcePath" = "8:lib\\monetdb5\\autoload\\01_batcalc.mal" @@ -4104,26 +4072,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F64E69D474DA4F6A89A1B014F77E4669" - { - "SourcePath" = "8:lib\\monetdb5\\createdb\\24_zorder.sql" - "TargetName" = "8:24_zorder.sql" - "Tag" = "8:" - "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F827A21B394243CA9A2DA27D42DA0C93" { "SourcePath" = "8:lib\\libmapi.lib" 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 @@ -187,6 +187,11 @@ /* Define to 1 if you have the `getaddrinfo' function. */ #define HAVE_GETADDRINFO 1 +/* Define to 1 if you have the `GetDynamicTimeZoneInformation' function. */ +#ifdef _MSC_VER +#define HAVE_GETDYNAMICTIMEZONEINFORMATION 1 +#endif + /* Define to 1 if you have the `getexecname' function. */ /* #undef HAVE_GETEXECNAME */ @@ -202,23 +207,9 @@ /* Define to 1 if you have the `getopt_long' function. */ /* #undef HAVE_GETOPT_LONG */ -/* Define to 1 if you have the `getrlimit' function. */ -/* #undef HAVE_GETRLIMIT */ - -/* Define to 1 if you have the `GetSystemInfo' function. */ -/* #undef HAVE_GETSYSTEMINFO */ - /* Define to 1 if you have the `gettimeofday' function. */ /* #undef HAVE_GETTIMEOFDAY */ -/* Define to 1 if you have the `_get_timezone' function. */ -#ifdef _MSC_VER -#define HAVE__GET_TIMEZONE 1 -#endif - -/* Define if you have the gsl library */ -/* #undef HAVE_GSL */ - /* Define to 1 if you have the `getuid' function. */ /* #undef HAVE_GETUID */ @@ -246,9 +237,6 @@ #define HAVE_ISINF 1 #endif -/* Define to 1 if you have the `kill' function. */ -/* #undef HAVE_KILL */ - /* Define to 1 if you have the <kvm.h> header file. */ /* #undef HAVE_KVM_H */ @@ -363,9 +351,6 @@ /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 -/* Define if the microhttpd server is to be enabled */ -/* #undef HAVE_MICROHTTPD */ - /* Define to 1 if you have the `mremap' function. */ /* #undef HAVE_MREMAP */ @@ -404,8 +389,6 @@ /* Define to 1 if you have the <perfmon/pfmlib.h> header file. */ /* #undef HAVE_PERFMON_PFMLIB_H */ -/* Define to 1 if you have the `pipe' function. */ -#define HAVE_PIPE 1 #ifdef pipe #undef pipe #endif @@ -432,12 +415,6 @@ /* Define if you have the pthread_kill function */ /* #undef HAVE_PTHREAD_KILL */ -/* Define if you have the pthread_kill_other_threads_np function */ -/* #undef HAVE_PTHREAD_KILL_OTHER_THREADS_NP */ - -/* Define if you have the pthread_setschedprio function */ -/* #undef HAVE_PTHREAD_SETSCHEDPRIO */ - /* Define if you have the pthread_sigmask function */ /* #undef HAVE_PTHREAD_SIGMASK */ @@ -450,18 +427,12 @@ /* Define to 1 if you have the <pwd.h> header file. */ /* #undef HAVE_PWD_H */ -/* Define to 1 if you have the <regex.h> header file. */ -/* #undef HAVE_REGEX_H */ - /* Define if the compiler supports the restrict keyword */ /* #undef HAVE_RESTRICT */ /* Define to 1 if you have the `RIPEMD160' function. */ #define HAVE_RIPEMD160 1 -/* Define to 1 if you have the <rlimit.h> header file. */ -/* #undef HAVE_RLIMIT_H */ - /* Define to 1 if you have the `round' function. */ #if !defined(_MSC_VER) || _MSC_VER > 1600 #define HAVE_ROUND 1 @@ -473,9 +444,6 @@ /* Define to 1 if you have the <samtools/kstring.h> header file. */ /* #undef HAVE_SAMTOOLS_KSTRING_H */ -/* Define to 1 if you have the `sbrk' function. */ -/* #undef HAVE_SBRK */ - /* Define to 1 if you have the <sched.h> header file. */ /* #undef HAVE_SCHED_H */ @@ -515,9 +483,6 @@ /* Define to 1 if you have the <signal.h> header file. */ #define HAVE_SIGNAL_H 1 -/* Define if your mallinfo struct has signed elements */ -/* #undef HAVE_SIGNED_MALLINFO */ - /* Define to 1 if the system has the type `socklen_t'. */ #define HAVE_SOCKLEN_T 1 @@ -604,9 +569,6 @@ #endif #endif -/* Define if you have struct mallinfo */ -/* #undef HAVE_STRUCT_MALLINFO */ - /* Define to 1 if you have the `sysconf' function. */ /* #undef HAVE_SYSCONF */ @@ -689,9 +651,6 @@ /* Define if you have mallinfo */ /* #undef HAVE_USEFUL_MALLINFO */ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list