Changeset: e786de92c6dc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e786de92c6dc Added Files: clients/Tests/MAL-signatures.malC clients/Tests/MAL-signatures.stable.err clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.sql clients/Tests/SQL-dump.stable.err clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/SQL-dump.stable.out.oid32 clients/Tests/SQL-dump.stable.out.oid32.int128 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 debian/monetdb5-server-hugeint.install debian/monetdb5-sql-hugeint.install monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single sql/backends/monet5/vaults/74_netcdf.mal sql/backends/monet5/vaults/74_netcdf.sql sql/backends/monet5/vaults/netcdf.c sql/backends/monet5/vaults/netcdf.mal sql/backends/monet5/vaults/netcdf_vault.h sql/benchmarks/tpch/LOCKED/Tests/17.stable.out.int128 sql/benchmarks/tpch/Tests/17.stable.out.int128 sql/benchmarks/tpch/Tests/22.stable.out.int128 sql/scripts/41_md5sum.sql sql/test/BugTracker-2010/Tests/crash-with-huge-query.Bug-2647.stable.out.int128 sql/test/BugTracker-2011/Tests/subquery_in_from_clause.Bug-2812.stable.out.int128 sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out.int128 sql/test/BugTracker-2015/Tests/alias.Bug-3704.sql sql/test/BugTracker-2015/Tests/alias.Bug-3704.stable.err sql/test/BugTracker-2015/Tests/alias.Bug-3704.stable.out sql/test/BugTracker-2015/Tests/assertHead.Bug-3706.sql sql/test/BugTracker-2015/Tests/assertHead.Bug-3706.stable.err sql/test/BugTracker-2015/Tests/assertHead.Bug-3706.stable.out sql/test/BugTracker-2015/Tests/case_aggr.Bug-3705.sql sql/test/BugTracker-2015/Tests/case_aggr.Bug-3705.stable.err sql/test/BugTracker-2015/Tests/case_aggr.Bug-3705.stable.out sql/test/BugTracker-2015/Tests/find_fk.Bug-3690.sql sql/test/BugTracker-2015/Tests/find_fk.Bug-3690.stable.err sql/test/BugTracker-2015/Tests/find_fk.Bug-3690.stable.out sql/test/BugTracker-2015/Tests/ifthenelse.Bug-3699.sql sql/test/BugTracker-2015/Tests/ifthenelse.Bug-3699.stable.err sql/test/BugTracker-2015/Tests/ifthenelse.Bug-3699.stable.out sql/test/BugTracker-2015/Tests/inf-nan-handling.Bug-3696.sql sql/test/BugTracker-2015/Tests/inf-nan-handling.Bug-3696.stable.err sql/test/BugTracker-2015/Tests/inf-nan-handling.Bug-3696.stable.out sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.sql sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.err sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.out sql/test/BugTracker-2015/Tests/is_null_limit.Bug-3684.sql sql/test/BugTracker-2015/Tests/is_null_limit.Bug-3684.stable.err sql/test/BugTracker-2015/Tests/is_null_limit.Bug-3684.stable.out sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693.sql sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693.stable.err sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693.stable.out sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693_2.sql sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693_2.stable.err sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693_2.stable.out sql/test/BugTracker-2015/Tests/readonly.Bug-3709.sql sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.err sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.out sql/test/BugTracker-2015/Tests/with-columns-mismatch.Bug-3697.sql sql/test/BugTracker-2015/Tests/with-columns-mismatch.Bug-3697.stable.err sql/test/BugTracker-2015/Tests/with-columns-mismatch.Bug-3697.stable.out sql/test/mergetables/Tests/doubletable.stable.err sql/test/mergetables/Tests/doubletable.stable.out sql/test/mergetables/Tests/forex.stable.out.int128 sql/test/mergetables/Tests/forex1.sql sql/test/mergetables/Tests/forex1.stable.err sql/test/mergetables/Tests/forex1.stable.out sql/test/mergetables/Tests/mergedropcrash.sql sql/test/mergetables/Tests/mergedropcrash.stable.err sql/test/mergetables/Tests/mergedropcrash.stable.out sql/test/remote/Tests/ssbm.stable.out.int128 Removed Files: clients/Tests/MAL-signatures_all.malC clients/Tests/MAL-signatures_all.stable.err clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_all.stable.out.int128 clients/Tests/MAL-signatures_fits_geom.malC.src clients/Tests/MAL-signatures_fits_geom.stable.err clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out.int128 clients/Tests/MAL-signatures_geom.malC.src clients/Tests/MAL-signatures_geom.stable.err clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out.int128 clients/Tests/MAL-signatures_none.malC.src clients/Tests/MAL-signatures_none.stable.err clients/Tests/MAL-signatures_none.stable.out clients/Tests/MAL-signatures_none.stable.out.int128 clients/Tests/SQL-dump_all.sql clients/Tests/SQL-dump_all.stable.err clients/Tests/SQL-dump_all.stable.out clients/Tests/SQL-dump_all.stable.out.oid32 clients/Tests/SQL-dump_geom.sql.src clients/Tests/SQL-dump_geom.stable.err clients/Tests/SQL-dump_geom.stable.out clients/Tests/SQL-dump_geom.stable.out.32bit clients/Tests/SQL-dump_geom.stable.out.64bit.oid32 clients/Tests/SQL-dump_geom.stable.out.int128 clients/Tests/SQL-dump_geom.stable.out.oid32.int128 clients/Tests/SQL-dump_none.sql.src clients/Tests/SQL-dump_none.stable.err clients/Tests/SQL-dump_none.stable.out clients/Tests/SQL-dump_none.stable.out.int128 sql/backends/monet5/rest/73_jsonstore.mal sql/backends/monet5/rest/Makefile.ag sql/backends/monet5/rest/Tests/All sql/backends/monet5/rest/Tests/jsonstore00.sql sql/backends/monet5/rest/Tests/jsonstore00.stable.err sql/backends/monet5/rest/Tests/jsonstore00.stable.out sql/backends/monet5/rest/Tests/jsonstore01.sql sql/backends/monet5/rest/Tests/jsonstore01.stable.err sql/backends/monet5/rest/Tests/jsonstore01.stable.out sql/backends/monet5/rest/jsonstore.mal sql/backends/monet5/rest/rest_jsonstore.c sql/backends/monet5/rest/rest_jsonstore.h sql/backends/monet5/rest/rest_jsonstore_handle_get.c sql/backends/monet5/rest/rest_jsonstore_handle_get.h sql/jdbc/tests/Tests/Test_Dobjects.SQL.bat sql/jdbc/tests/Tests/Test_Dobjects_bam.SQL.sh sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.err sql/scripts/41_jsonstore.sql sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.sql.src sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.stable.err sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.stable.out sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.sql.src sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.stable.err sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.stable.out sql/test/Dependencies/Tests/Dependencies_bam.SQL.py.src sql/test/Dependencies/Tests/Dependencies_bam.stable.err sql/test/Dependencies/Tests/Dependencies_bam.stable.out sql/test/Dependencies/Tests/Dependencies_bam.stable.out.int128 sql/test/Tests/coalesce.stable.err.single sql/test/Tests/keys_bam.sql.src sql/test/Tests/keys_bam.stable.err sql/test/Tests/keys_bam.stable.out sql/test/Tests/systemfunctions_bam.sql.src sql/test/Tests/systemfunctions_bam.stable.err sql/test/Tests/systemfunctions_bam.stable.out sql/test/Tests/systemfunctions_gsl.sql.src sql/test/Tests/systemfunctions_gsl.stable.err sql/test/Tests/systemfunctions_gsl.stable.out sql/test/Tests/systemfunctions_gsl.stable.out.int128 sql/test/Tests/systemfunctions_nogeom.sql.src sql/test/Tests/systemfunctions_nogeom.stable.err sql/test/Tests/systemfunctions_nogeom.stable.out sql/test/Tests/systemfunctions_nogeom.stable.out.int128 sql/test/Tests/trace_nogeom.sql.src sql/test/Tests/trace_nogeom.stable.err sql/test/Tests/trace_nogeom.stable.out sql/test/Tests/trace_nogeom.stable.out.int128 sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566_bam.sql.src sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566_bam.stable.err sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566_bam.stable.out sql/test/leaks/Tests/check0_bam.sql.src sql/test/leaks/Tests/check0_bam.stable.err sql/test/leaks/Tests/check0_bam.stable.out sql/test/leaks/Tests/check0_bam.stable.out.int128 sql/test/leaks/Tests/check0_gsl.sql.src sql/test/leaks/Tests/check0_gsl.stable.err sql/test/leaks/Tests/check0_gsl.stable.out sql/test/leaks/Tests/check0_gsl.stable.out.int128 sql/test/leaks/Tests/check0_nogeom.sql.src sql/test/leaks/Tests/check0_nogeom.stable.err sql/test/leaks/Tests/check0_nogeom.stable.out sql/test/leaks/Tests/check0_nogeom.stable.out.int128 sql/test/leaks/Tests/check1_bam.sql.src sql/test/leaks/Tests/check1_bam.stable.err sql/test/leaks/Tests/check1_bam.stable.out sql/test/leaks/Tests/check1_gsl.sql.src sql/test/leaks/Tests/check1_gsl.stable.err sql/test/leaks/Tests/check1_gsl.stable.out sql/test/leaks/Tests/check1_gsl.stable.out.int128 sql/test/leaks/Tests/check1_nogeom.sql.src sql/test/leaks/Tests/check1_nogeom.stable.err sql/test/leaks/Tests/check1_nogeom.stable.out sql/test/leaks/Tests/check1_nogeom.stable.out.int128 sql/test/leaks/Tests/check2_bam.sql.src sql/test/leaks/Tests/check2_bam.stable.err sql/test/leaks/Tests/check2_bam.stable.out sql/test/leaks/Tests/check2_gsl.sql.src sql/test/leaks/Tests/check2_gsl.stable.err sql/test/leaks/Tests/check2_gsl.stable.out sql/test/leaks/Tests/check2_gsl.stable.out.int128 sql/test/leaks/Tests/check2_nogeom.sql.src sql/test/leaks/Tests/check2_nogeom.stable.err sql/test/leaks/Tests/check2_nogeom.stable.out sql/test/leaks/Tests/check2_nogeom.stable.out.int128 sql/test/leaks/Tests/check3_bam.sql.src sql/test/leaks/Tests/check3_bam.stable.err sql/test/leaks/Tests/check3_bam.stable.out sql/test/leaks/Tests/check3_gsl.sql.src sql/test/leaks/Tests/check3_gsl.stable.err sql/test/leaks/Tests/check3_gsl.stable.out sql/test/leaks/Tests/check3_gsl.stable.out.int128 sql/test/leaks/Tests/check3_nogeom.sql.src sql/test/leaks/Tests/check3_nogeom.stable.err sql/test/leaks/Tests/check3_nogeom.stable.out sql/test/leaks/Tests/check3_nogeom.stable.out.int128 sql/test/leaks/Tests/check4_bam.sql.src sql/test/leaks/Tests/check4_bam.stable.err sql/test/leaks/Tests/check4_bam.stable.out sql/test/leaks/Tests/check4_gsl.sql.src sql/test/leaks/Tests/check4_gsl.stable.err sql/test/leaks/Tests/check4_gsl.stable.out sql/test/leaks/Tests/check4_gsl.stable.out.int128 sql/test/leaks/Tests/check4_nogeom.sql.src sql/test/leaks/Tests/check4_nogeom.stable.err sql/test/leaks/Tests/check4_nogeom.stable.out sql/test/leaks/Tests/check4_nogeom.stable.out.int128 sql/test/leaks/Tests/check5_bam.sql.src sql/test/leaks/Tests/check5_bam.stable.err sql/test/leaks/Tests/check5_bam.stable.out sql/test/leaks/Tests/check5_gsl.sql.src sql/test/leaks/Tests/check5_gsl.stable.err sql/test/leaks/Tests/check5_gsl.stable.out sql/test/leaks/Tests/check5_gsl.stable.out.int128 sql/test/leaks/Tests/check5_nogeom.sql.src sql/test/leaks/Tests/check5_nogeom.stable.err sql/test/leaks/Tests/check5_nogeom.stable.out sql/test/leaks/Tests/check5_nogeom.stable.out.int128 sql/test/leaks/Tests/drop3_bam.sql.src sql/test/leaks/Tests/drop3_bam.stable.err sql/test/leaks/Tests/drop3_bam.stable.out sql/test/leaks/Tests/drop3_bam.stable.out.int128 sql/test/leaks/Tests/drop3_gsl.sql.src sql/test/leaks/Tests/drop3_gsl.stable.err sql/test/leaks/Tests/drop3_gsl.stable.out sql/test/leaks/Tests/drop3_gsl.stable.out.int128 sql/test/leaks/Tests/drop3_nogeom.sql.src sql/test/leaks/Tests/drop3_nogeom.stable.err sql/test/leaks/Tests/drop3_nogeom.stable.out sql/test/leaks/Tests/drop3_nogeom.stable.out.int128 sql/test/leaks/Tests/select1_bam.sql.src sql/test/leaks/Tests/select1_bam.stable.err sql/test/leaks/Tests/select1_bam.stable.out sql/test/leaks/Tests/select1_bam.stable.out.int128 sql/test/leaks/Tests/select1_gsl.sql.src sql/test/leaks/Tests/select1_gsl.stable.err sql/test/leaks/Tests/select1_gsl.stable.out sql/test/leaks/Tests/select1_gsl.stable.out.int128 sql/test/leaks/Tests/select1_nogeom.sql.src sql/test/leaks/Tests/select1_nogeom.stable.err sql/test/leaks/Tests/select1_nogeom.stable.out sql/test/leaks/Tests/select1_nogeom.stable.out.int128 sql/test/leaks/Tests/select2_bam.sql.src sql/test/leaks/Tests/select2_bam.stable.err sql/test/leaks/Tests/select2_bam.stable.out sql/test/leaks/Tests/select2_bam.stable.out.int128 sql/test/leaks/Tests/select2_gsl.sql.src sql/test/leaks/Tests/select2_gsl.stable.err sql/test/leaks/Tests/select2_gsl.stable.out sql/test/leaks/Tests/select2_gsl.stable.out.int128 sql/test/leaks/Tests/select2_nogeom.sql.src sql/test/leaks/Tests/select2_nogeom.stable.err sql/test/leaks/Tests/select2_nogeom.stable.out sql/test/leaks/Tests/select2_nogeom.stable.out.int128 sql/test/leaks/Tests/temp1_bam.sql.src sql/test/leaks/Tests/temp1_bam.stable.err sql/test/leaks/Tests/temp1_bam.stable.out sql/test/leaks/Tests/temp1_bam.stable.out.int128 sql/test/leaks/Tests/temp1_gsl.sql.src sql/test/leaks/Tests/temp1_gsl.stable.err sql/test/leaks/Tests/temp1_gsl.stable.out sql/test/leaks/Tests/temp1_gsl.stable.out.int128 sql/test/leaks/Tests/temp1_nogeom.sql.src sql/test/leaks/Tests/temp1_nogeom.stable.err sql/test/leaks/Tests/temp1_nogeom.stable.out sql/test/leaks/Tests/temp1_nogeom.stable.out.int128 sql/test/leaks/Tests/temp2_bam.sql.src sql/test/leaks/Tests/temp2_bam.stable.err sql/test/leaks/Tests/temp2_bam.stable.out sql/test/leaks/Tests/temp2_bam.stable.out.int128 sql/test/leaks/Tests/temp2_gsl.sql.src sql/test/leaks/Tests/temp2_gsl.stable.err sql/test/leaks/Tests/temp2_gsl.stable.out sql/test/leaks/Tests/temp2_gsl.stable.out.int128 sql/test/leaks/Tests/temp2_nogeom.sql.src sql/test/leaks/Tests/temp2_nogeom.stable.err sql/test/leaks/Tests/temp2_nogeom.stable.out sql/test/leaks/Tests/temp2_nogeom.stable.out.int128 sql/test/leaks/Tests/temp3_bam.sql.src sql/test/leaks/Tests/temp3_bam.stable.err sql/test/leaks/Tests/temp3_bam.stable.out sql/test/leaks/Tests/temp3_bam.stable.out.int128 sql/test/leaks/Tests/temp3_gsl.sql.src sql/test/leaks/Tests/temp3_gsl.stable.err sql/test/leaks/Tests/temp3_gsl.stable.out sql/test/leaks/Tests/temp3_gsl.stable.out.int128 sql/test/leaks/Tests/temp3_nogeom.sql.src sql/test/leaks/Tests/temp3_nogeom.stable.err sql/test/leaks/Tests/temp3_nogeom.stable.out sql/test/leaks/Tests/temp3_nogeom.stable.out.int128 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.Oct2014 buildtools/autogen/autogen/am.py clients/R/MonetDB.R/DESCRIPTION clients/R/MonetDB.R/NEWS clients/R/MonetDB.R/R/dbi.R clients/R/Tests/dbi.R clients/R/Tests/dbi.stable.out clients/Tests/All clients/Tests/exports.stable.out clients/mapiclient/Tests/All clients/mapiclient/Tests/tomograph--help.stable.err clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py clients/ruby/adapter/activerecord-monetdb-adapter-0.1.gemspec clients/ruby/ruby-monetdb-sql-0.1.gemspec configure.ag debian/changelog debian/control debian/monetdb5-server.install debian/monetdb5-sql.install gdk/ChangeLog-Archive gdk/ChangeLog.Oct2014 gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_private.h gdk/gdk_search.c gdk/gdk_select.c gdk/libbat.rc java/Makefile.ag java/build.properties java/pom.xml java/release.txt libversions monetdb5/mal/Makefile.ag monetdb5/mal/Tests/performanceTests/performanceLog monetdb5/mal/Tests/performanceTests/tst901a.mal monetdb5/mal/Tests/performanceTests/tst901b.mal monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_http_daemon.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_recycle.c monetdb5/mal/mal_resource.c monetdb5/mal/mal_runtime.c monetdb5/modules/kernel/algebra.c monetdb5/modules/mal/joinpath.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/pcre.c monetdb5/optimizer/opt_joinpath.c monetdb5/tools/Tests/mserver5--help.stable.err monetdb5/tools/libmonetdb5.rc sql/backends/monet5/Makefile.ag sql/backends/monet5/Tests/limithack.stable.out sql/backends/monet5/Tests/rapi09.stable.out sql/backends/monet5/bam/Tests/bam_loader_file.stable.out sql/backends/monet5/bam/Tests/mergetable.stable.out sql/backends/monet5/generator/Tests/generator00.stable.out sql/backends/monet5/generator/Tests/rangejoin.stable.out sql/backends/monet5/gsl/Tests/gsl01.stable.out sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/Makefile.ag sql/benchmarks/nobench/Tests/nobench.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/tpch/LOCKED/Tests/01-22.stable.out sql/benchmarks/tpch/LOCKED/Tests/01.stable.out sql/benchmarks/tpch/LOCKED/Tests/17.stable.out sql/benchmarks/tpch/LOCKED/Tests/18.stable.out sql/benchmarks/tpch/LOCKED/Tests/22.stable.out sql/benchmarks/tpch/Tests/01-22.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/01.stable.out sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/17-plan.stable.out sql/benchmarks/tpch/Tests/17.stable.out sql/benchmarks/tpch/Tests/18-explain.stable.out sql/benchmarks/tpch/Tests/18-plan.stable.out sql/benchmarks/tpch/Tests/18.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit sql/benchmarks/tpch/Tests/20-plan.stable.out sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22.stable.out sql/benchmarks/tpch/alter.sql sql/benchmarks/tpch/load.sh sql/common/Makefile.ag sql/common/sql_types.c sql/jdbc/tests/Tests/All sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh sql/jdbc/tests/Tests/Test_Dobjects.stable.err sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/scripts/75_storagemodel.sql sql/scripts/Makefile.ag sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_parser.y sql/server/sql_scan.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_table.c sql/storage/store.c sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.out sql/test/BugTracker-2010/Tests/crash-with-huge-query.Bug-2647.stable.out sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out sql/test/BugTracker-2011/Tests/subquery_in_from_clause.Bug-2812.stable.out sql/test/BugTracker-2012/Tests/All sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.sql sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.err 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.sql sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.err sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out sql/test/BugTracker-2013/Tests/Cannot_Find_Column_Type.Bug-3394.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-2013/Tests/copy-out-quote.Bug-3393.stable.out sql/test/BugTracker-2013/Tests/json_is_null.Bug-3406.stable.out sql/test/BugTracker-2013/Tests/nested_concat_query.Bug-3408.stable.out sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out sql/test/BugTracker-2013/Tests/recursion.stable.out sql/test/BugTracker-2013/Tests/restore-uuid.Bug-3407.stable.out sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.stable.out sql/test/BugTracker-2014/Tests/aggr-with-limit.Bug-3498.stable.out sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.stable.out sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.stable.out sql/test/BugTracker-2014/Tests/combined_WHERE_conditions.Bug-3642.stable.out sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.stable.out sql/test/BugTracker-2014/Tests/empty_intermediate_quantile.Bug-3611.stable.out sql/test/BugTracker-2014/Tests/fk-property-assert.Bug-3612.stable.out 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/insert_into_temp_table.Bug-3600.stable.out sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.stable.out sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.out sql/test/BugTracker-2014/Tests/sign-sorted.Bug-3594.stable.out sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.stable.out sql/test/BugTracker-2014/Tests/subselect-reverse.Bug-3552.stable.out sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.sql sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.out sql/test/BugTracker-2014/Tests/uppercaseboolean.Bug-3519.stable.out sql/test/BugTracker-2015/Tests/All sql/test/BugTracker-2015/Tests/float-space-parse.Bug-3691.stable.out sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.stable.out sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.stable.out sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.stable.out sql/test/BugTracker-2015/Tests/row-value-constructor-crash.Bug-3662.stable.out sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.out sql/test/BugTracker-2015/Tests/string-to-inet.Bug-3666.stable.out sql/test/Dependencies/Tests/All sql/test/Dependencies/Tests/Dependencies.SQL.py 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/All sql/test/Tests/keys.sql.src sql/test/Tests/keys.stable.err sql/test/Tests/keys.stable.out sql/test/Tests/str-pad.stable.out sql/test/Tests/str-trim.stable.out sql/test/Tests/systemfunctions.sql sql/test/Tests/systemfunctions.stable.err sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/Update_Delete_action/Tests/delete_cascade.stable.out sql/test/bugs/Tests/All sql/test/bugs/Tests/apply_with_union_assertion.stable.out sql/test/bugs/Tests/crash_order_by.stable.out sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.sql.src sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.err sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out sql/test/bugs/Tests/insert_delete-bug-sf-904025.stable.out sql/test/bugs/Tests/simple_view.stable.out sql/test/json/Tests/aggregate00.stable.out sql/test/json/Tests/aggregate01.stable.out sql/test/json/Tests/bulklength.stable.out sql/test/json/Tests/shop.stable.out sql/test/json/Tests/spaceissue.stable.out sql/test/leaks/Tests/All sql/test/leaks/Tests/check0.sql sql/test/leaks/Tests/check0.stable.err sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check0.stable.out.int128 sql/test/leaks/Tests/check1.sql.src sql/test/leaks/Tests/check1.stable.err sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.sql.src sql/test/leaks/Tests/check2.stable.err sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.sql.src sql/test/leaks/Tests/check3.stable.err sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.sql.src sql/test/leaks/Tests/check4.stable.err sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.sql.src sql/test/leaks/Tests/check5.stable.err sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 sql/test/leaks/Tests/drop3.sql sql/test/leaks/Tests/drop3.stable.err sql/test/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/drop3.stable.out.int128 sql/test/leaks/Tests/select1.sql sql/test/leaks/Tests/select1.stable.err sql/test/leaks/Tests/select1.stable.out sql/test/leaks/Tests/select1.stable.out.int128 sql/test/leaks/Tests/select2.sql sql/test/leaks/Tests/select2.stable.err sql/test/leaks/Tests/select2.stable.out sql/test/leaks/Tests/select2.stable.out.int128 sql/test/leaks/Tests/temp1.sql sql/test/leaks/Tests/temp1.stable.err sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp1.stable.out.int128 sql/test/leaks/Tests/temp2.sql sql/test/leaks/Tests/temp2.stable.err sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp2.stable.out.int128 sql/test/leaks/Tests/temp3.sql sql/test/leaks/Tests/temp3.stable.err sql/test/leaks/Tests/temp3.stable.out sql/test/leaks/Tests/temp3.stable.out.int128 sql/test/mapi/Tests/perl_int128.stable.out sql/test/mergetables/Tests/All sql/test/mergetables/Tests/doubletable.sql sql/test/mergetables/Tests/forex.stable.out sql/test/mergetables/Tests/mergedrop.sql sql/test/mergetables/Tests/mergeinit.stable.out sql/test/pg_regress/Tests/float4.stable.err sql/test/pg_regress/Tests/float4.stable.out sql/test/pg_regress/Tests/float8.stable.err sql/test/pg_regress/Tests/float8.stable.err.Windows sql/test/pg_regress/Tests/float8.stable.out sql/test/pg_regress/Tests/float8.stable.out.Windows sql/test/pg_regress/Tests/interval.stable.err.int128 sql/test/pg_regress/Tests/interval.stable.out sql/test/pg_regress/Tests/numeric_big.stable.out sql/test/pg_regress/Tests/numerology.stable.out sql/test/pg_regress/Tests/strings_cast.stable.out sql/test/pg_regress/Tests/text.stable.out sql/test/pg_regress/Tests/timestamp.stable.out sql/test/pg_regress/Tests/without_oid.stable.out sql/test/pg_regress/Tests/without_oid.stable.out.oid32 sql/test/quantiles/Tests/quantiles.stable.out sql/test/remote/Tests/ssbm.SQL.py sql/test/remote/Tests/ssbm.stable.out sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows testing/Mtest.py.in tools/merovingian/daemon/merovingian.c tools/mserver/mserver5.c vertoo.data Branch: mosaic Log Message:
Merge with default diffs (truncated from 593724 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -91,7 +91,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Oct2014-SP2/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Oct2014-SP3/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -637,6 +637,7 @@ fi %exclude %{_libdir}/monetdb5/rapi.mal %endif %exclude %{_libdir}/monetdb5/sql*.mal +%exclude %{_libdir}/monetdb5/*_hge.mal %{_libdir}/monetdb5/*.mal %if %{?with_geos:1}%{!?with_geos:0} %exclude %{_libdir}/monetdb5/autoload/*_geom.mal @@ -663,6 +664,26 @@ fi %{_libdir}/monetdb5/*.so %doc %{_mandir}/man1/mserver5.1.gz +%package -n MonetDB5-server-hugeint +Summary: MonetDB - 128-bit integer support for MonetDB5-server +Group: Application/Databases +Requires: MonetDB5-server + +%description -n MonetDB5-server-hugeint +MonetDB is a database management system that is developed from a +main-memory perspective with use of a fully decomposed storage model, +automatic index management, extensibility of data types and search +accelerators. It also has an SQL frontend. + +This package provides HUGEINT (128-bit integer) support for the +MonetDB5-server component. + +%files -n MonetDB5-server-hugeint +%exclude %{_libdir}/monetdb5/sql*_hge.mal +%{_libdir}/monetdb5/*_hge.mal +%exclude %{_libdir}/monetdb5/autoload/??_sql_hge.mal +%{_libdir}/monetdb5/autoload/*_hge.mal + %package -n MonetDB5-server-devel Summary: MonetDB development files Group: Applications/Databases @@ -723,7 +744,7 @@ systemd-tmpfiles --create %{_sysconfdir} %exclude %{_sysconfdir}/tmpfiles.d/monetdbd.conf %endif %config(noreplace) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties -%{_libdir}/monetdb5/autoload/??_sql*.mal +%{_libdir}/monetdb5/autoload/??_sql.mal %{_libdir}/monetdb5/lib_sql.so %{_libdir}/monetdb5/*.sql %dir %{_libdir}/monetdb5/createdb @@ -734,7 +755,9 @@ systemd-tmpfiles --create %{_sysconfdir} %if %{?with_samtools:1}%{!?with_samtools:0} %exclude %{_libdir}/monetdb5/createdb/*_bam.sql %endif -%{_libdir}/monetdb5/createdb/* +%exclude %{_libdir}/monetdb5/createdb/*_hge.sql +%{_libdir}/monetdb5/createdb/*.sql +%exclude %{_libdir}/monetdb5/sql*_hge.mal %{_libdir}/monetdb5/sql*.mal %doc %{_mandir}/man1/monetdb.1.gz %doc %{_mandir}/man1/monetdbd.1.gz @@ -748,6 +771,27 @@ systemd-tmpfiles --create %{_sysconfdir} %{_datadir}/doc/MonetDB-SQL-%{version}/* %endif +%package SQL-server5-hugeint +Summary: MonetDB5 128 bit integer (hugeint) support for SQL +Group: Applications/Databases +Requires: MonetDB5-server-hugeint = %{version}-%{release} +Requires: MonetDB-SQL-server5 = %{version}-%{release} + +%description SQL-server5-hugeint +MonetDB is a database management system that is developed from a +main-memory perspective with use of a fully decomposed storage model, +automatic index management, extensibility of data types and search +accelerators. It also has an SQL frontend. + +This package provides HUGEINT (128-bit integer) support for the SQL +frontend of MonetDB. + +%files SQL-server5-hugeint +%defattr(-,root,root) +%{_libdir}/monetdb5/autoload/??_sql_hge.mal +%{_libdir}/monetdb5/createdb/*_hge.sql +%{_libdir}/monetdb5/sql*_hge.mal + %package -n python-monetdb Summary: Native MonetDB client Python API Group: Applications/Databases @@ -865,7 +909,6 @@ developer, but if you do want to test, t --enable-gsl=yes \ --enable-instrument=no \ --enable-jdbc=no \ - --enable-jsonstore=no \ --enable-merocontrol=no \ --enable-microhttpd=no \ --enable-monetdb5=yes \ @@ -898,38 +941,100 @@ developer, but if you do want to test, t make %install -rm -rf $RPM_BUILD_ROOT - -%makeinstall - -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/MonetDB -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/monetdb5/dbfarm -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/monetdb -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/monetdb -mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib} -if [ ! $RPM_BUILD_ROOT%{_prefix}/lib/perl5 -ef $RPM_BUILD_ROOT%{perl_vendorlib} ]; then - mv $RPM_BUILD_ROOT%{_prefix}/lib/perl5/* $RPM_BUILD_ROOT%{perl_vendorlib} +%make_install + +mkdir -p %{buildroot}%{_localstatedir}/MonetDB +mkdir -p %{buildroot}%{_localstatedir}/monetdb5/dbfarm +mkdir -p %{buildroot}%{_localstatedir}/log/monetdb +mkdir -p %{buildroot}%{_localstatedir}/run/monetdb +mkdir -p %{buildroot}%{perl_vendorlib} +if [ ! %{buildroot}%{_prefix}/lib/perl5 -ef %{buildroot}%{perl_vendorlib} ]; then + mv %{buildroot}%{_prefix}/lib/perl5/* %{buildroot}%{perl_vendorlib} fi # remove unwanted stuff # .la files -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/monetdb5/*.la +rm -f %{buildroot}%{_libdir}/*.la +rm -f %{buildroot}%{_libdir}/monetdb5/*.la # internal development stuff -rm -f $RPM_BUILD_ROOT%{_bindir}/Maddlog +rm -f %{buildroot}%{_bindir}/Maddlog %if 0%{?fedora} >= 20 -mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetDB-SQL-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/MonetDB-SQL +mv %{buildroot}%{_datadir}/doc/MonetDB-SQL-%{version} %{buildroot}%{_datadir}/doc/MonetDB-SQL %endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%clean -rm -fr $RPM_BUILD_ROOT - %changelog +* Thu Apr 23 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.11-20150423 +- Rebuilt. +- BZ#3466: UPDATE statements fails with "GDKerror: MT_mremap() failed" +- BZ#3602: Surprising overload resolution of generate_series +- BZ#3613: SQL data dictionary contains columns names which are also + special keywords. This causes unexpected/unneeded SQL query errors +- BZ#3645: Network address operators such as << and <<= do not work +- BZ#3647: missing BAT for a column leads to crash in gtr_update_delta +- BZ#3648: memory corruption on unclean connection shutdown with local + temporary tables +- BZ#3650: Naming of persistent BATs is fragile +- BZ#3653: PREPARE crashes mserver if unbound variable is function + parameter +- BZ#3655: SQL WHERE -1 in (-1) issue? +- BZ#3656: error message after calling fitsload() +- BZ#3660: Incorrect Results for Comparison Operators on inet Datatype +- BZ#3661: Ship debug symbols for pre-built binaries +- BZ#3662: UPDATE row with row value constructor crashes monetdb server +- BZ#3663: Incorrect result ROW_NUMBER in subquery +- BZ#3664: SQLstatementIntern missing parameter when using jsonstore +- BZ#3665: inter-session starvation issue, particularly affects sys.queue +- BZ#3666: casting text column to inet truncating text column and + resulting inet for first occurrence only +- BZ#3667: insert of negative value for oid column aborts mserver5 + process with assertion failure +- BZ#3669: ALTER TABLE <tbl_nm> ADD CONSTRAINT <tbl_uc1> UNIQUE (col1, + col2, col3) causes Assertion failure and abort +- BZ#3671: ODBC-Access on Windows 2012 does not work - E_FAIL +- BZ#3672: libbat_la-gdk_utils.o: relocation R_X86_64_PC32 against + `MT_global_exit' can not be used when making a shared object +- BZ#3676: merovingian hangs trying to exit +- BZ#3677: Crash in BATgroup_internal (caused by 87379087770d?) +- BZ#3678: Ruby driver installation ignores prefix +- BZ#3680: Prepared statements fail on execution with message 'Symbol + type not found' +- BZ#3684: Wrong query result set WHERE "IS NULL" or "NOT IN" clauses + uses in combination with ORDER, LIMIT and OFFSET +- BZ#3687: 'bat.insert' undefined +- BZ#3688: Crash at exit (overrun THRerrorcount?) +- BZ#3689: No more connections accepted if a single client misbehaves +- BZ#3690: find_fk: Assertion `t && i' failed. +- BZ#3691: conversion of whitespaces string to double or float is accepted + without an error during insert +- BZ#3693: algebra.join undefined (caused by non-existing variables in + the plan) +- BZ#3696: Inconsistent behavior between dbl (SQL double) and flt (SQL + real) data types and across platforms +- BZ#3697: mserver5[26946]: segfault at 0 ip 00007f3d0e1ab808 sp + 00007f3cefbfcad0 error 4 in lib_sql.so[7f3d0e180000+16c000] +- BZ#3699: segfault again! (during last week I found 3 segfault bugs + already) +- BZ#3703: INSERT INTO a MERGE TABLE crashes mserver5 +- BZ#3704: Unknown identifier from subquery +- BZ#3705: Assertion failure in rel_bin.c:2274: rel2bin_project: Assertion + `0' failed. +- BZ#3706: Assertion failure in gdk_bat.c: BATassertHeadProps: Assertion + `!b->H->sorted || cmp <= 0' failed. +- BZ#3709: "BATproject: does not match always" on abusive use of ALTER + TABLE SET READ ONLY + +* Tue Feb 3 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.11-20150423 +- buildtools: We now also create debug packages for Debian and Ubuntu. + +* Tue Jan 27 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.11-20150423 +- gdk: Replaced the rangejoin implementation with one that uses imprints if + it can. + * Fri Jan 23 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.9-20150123 - Rebuilt. - BZ#3467: Field aliases with '#' character excise field names in 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 @@ -2030,8 +2030,8 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4EB618ABA45B48A2B358D8F899B302FC" { - "SourcePath" = "8:lib\\monetdb5\\createdb\\41_jsonstore.sql" - "TargetName" = "8:41_jsonstore.sql" + "SourcePath" = "8:lib\\monetdb5\\createdb\\41_md5sum.sql" + "TargetName" = "8:41_md5sum.sql" "Tag" = "8:" "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567" "Condition" = "8:" 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 @@ -2030,8 +2030,8 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4EB618ABA45B48A2B358D8F899B302FC" { - "SourcePath" = "8:lib\\monetdb5\\createdb\\41_jsonstore.sql" - "TargetName" = "8:41_jsonstore.sql" + "SourcePath" = "8:lib\\monetdb5\\createdb\\41_md5sum.sql" + "TargetName" = "8:41_md5sum.sql" "Tag" = "8:" "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567" "Condition" = "8:" 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 @@ -221,9 +221,6 @@ #define HAVE_ISINF 1 #endif -/* Define that you want to build the jsonstore library */ -/* #undef HAVE_JSONSTORE */ - /* Define to 1 if you have the `kill' function. */ /* #undef HAVE_KILL */ @@ -349,6 +346,9 @@ /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ /* #undef HAVE_NDIR_H */ +/* Define if you have netcdf installed */ +/* #undef HAVE_NETCDF */ + /* Define to 1 if you have the <netdb.h> header file. */ /* #undef HAVE_NETDB_H */ diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -373,6 +373,11 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) HAVE_MONETDB5_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF +!IFDEF HAVE_NETCDF + $(ECHO) HAVE_NETCDF_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" +!ELSE + $(ECHO) HAVE_NETCDF_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" +!ENDIF !IFDEF HAVE_ODBC $(ECHO) HAVE_ODBC_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE @@ -423,11 +428,6 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) HAVE_SQL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF -!IFDEF HAVE_JSONSTORE - $(ECHO) HAVE_JSONSTORE_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" -!ELSE - $(ECHO) HAVE_JSONSTORE_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF !IFDEF HAVE_TESTING $(ECHO) HAVE_TESTING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
