Changeset: 37abf23875fc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=37abf23875fc
Added Files:
        clients/Tests/MAL-signatures.sql
        sql/backends/monet5/Tests/pyloader06.sql
        sql/backends/monet5/Tests/pyloader06.stable.err
        sql/backends/monet5/Tests/pyloader06.stable.out
        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/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/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/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
        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:
        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/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/scripts/24_zorder.sql
        
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:
        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
        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/ChangeLog
        gdk/gdk.h
        gdk/gdk_aggr.c
        gdk/gdk_atoms.h
        gdk/gdk_bat.c
        gdk/gdk_bbp.c
        gdk/gdk_bbp.h
        gdk/gdk_calc.h
        gdk/gdk_cross.c
        gdk/gdk_heap.c
        gdk/gdk_posix.c
        gdk/gdk_private.h
        gdk/gdk_storage.c
        gdk/gdk_unique.c
        gdk/gdk_utils.c
        gdk/gdk_utils.h
        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/ChangeLog
        
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/extras/mal_optimizer_template/opt_sql_append.c
        monetdb5/extras/mal_optimizer_template/opt_sql_append.h
        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/json.c
        monetdb5/modules/atoms/uuid.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/Tests/inspect05.stable.out
        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/mkey.c
        monetdb5/modules/mal/mkey.h
        monetdb5/modules/mal/pcre.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/Tests/manifold2.stable.out.single
        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.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/Makefile.ag
        sql/backends/monet5/Tests/All
        sql/backends/monet5/Tests/pyloader04.stable.err
        sql/backends/monet5/UDF/pyapi/emit.c
        sql/backends/monet5/UDF/pyapi/emit.h
        sql/backends/monet5/UDF/pyapi/pyapi.c
        sql/backends/monet5/UDF/pyapi/pyapi.h
        sql/backends/monet5/UDF/pyapi/pyloader.c
        sql/backends/monet5/UDF/pyapi/pytypes.h
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql.mal
        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_rank.c
        sql/backends/monet5/sql_result.c
        sql/backends/monet5/sql_scenario.c
        sql/backends/monet5/sql_statement.c
        sql/backends/monet5/sql_statement.h
        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/fits/Makefile.ag
        sql/backends/monet5/vaults/lidar/Makefile.ag
        sql/backends/monet5/vaults/netcdf/Makefile.ag
        sql/backends/monet5/vaults/shp/Makefile.ag
        sql/benchmarks/tpch/Tests/01-explain.stable.out
        sql/benchmarks/tpch/Tests/03-explain.stable.out
        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/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/19-explain.stable.out
        sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
        sql/common/sql_keyword.c
        sql/common/sql_list.c
        sql/common/sql_types.c
        sql/include/sql_catalog.h
        sql/include/sql_relation.h
        sql/scripts/25_debug.sql
        sql/scripts/75_storagemodel.sql
        sql/scripts/80_statistics.sql
        sql/scripts/Makefile.ag
        sql/server/Makefile.ag
        sql/server/rel_exp.c
        sql/server/rel_exp.h
        sql/server/rel_optimizer.c
        sql/server/rel_psm.c
        sql/server/rel_psm.h
        sql/server/rel_rel.c
        sql/server/rel_rel.h
        sql/server/rel_select.c
        sql/server/rel_select.h
        sql/server/rel_updates.c
        sql/server/sql_datetime.c
        sql/server/sql_decimal.c
        sql/server/sql_mvc.c
        sql/server/sql_parser.y
        sql/server/sql_scan.c
        sql/server/sql_symbol.c
        sql/server/sql_symbol.h
        sql/storage/bat/bat_storage.c
        sql/storage/store.c
        sql/test/BugTracker-2009/Tests/All
        
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
        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/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
        sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out.single
        
sql/test/BugTracker-2015/Tests/expression_with_comparison.Bug-3854.stable.out
        
sql/test/BugTracker-2015/Tests/mserver-crashes-under-specific-combination-of-JOIN-and-WHERE-conditions.Bug-3872.stable.out
        sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
        sql/test/BugTracker-2016/Tests/All
        
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
        sql/test/BugTracker-2016/Tests/storagemodel.stable.out
        sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
        sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
        sql/test/Dependencies/Tests/Dependencies.stable.out
        sql/test/SQLite_regress/sqllogictest/Tests/All
        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/pg_regress/Tests/interval.stable.err
        sql/test/pg_regress/Tests/interval.stable.err.int128
        sql/test/pg_regress/Tests/interval.stable.out
        sql/test/pg_regress/Tests/interval.stable.out.int128
        sql/test/pg_regress/Tests/strings.stable.err
        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.32bit
        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/merovingian/daemon/argvcmds.c
        tools/merovingian/daemon/handlers.c
        tools/merovingian/daemon/monetdbd.service.in
        tools/mserver/mserver5.c
Branch: graph1
Log Message:

Merge with upstream


diffs (truncated from 131132 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

Reply via email to