Changeset: 70fba9a23044 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=70fba9a23044 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/mapiclient/Tests/tachograph--help clients/mapiclient/Tests/tachograph--help.bat clients/mapiclient/Tests/tachograph--help.stable.err clients/mapiclient/Tests/tachograph--help.stable.out 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/scripts/51_sys_schema_extension.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/adddrop_unknown_table.Bug-3718.sql sql/test/BugTracker-2015/Tests/adddrop_unknown_table.Bug-3718.stable.err sql/test/BugTracker-2015/Tests/adddrop_unknown_table.Bug-3718.stable.out sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.sql sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.stable.err sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.stable.out sql/test/BugTracker-2015/Tests/crash_on_alter_set_not_null.Bug-3715.sql sql/test/BugTracker-2015/Tests/crash_on_alter_set_not_null.Bug-3715.stable.err sql/test/BugTracker-2015/Tests/crash_on_alter_set_not_null.Bug-3715.stable.out sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.sql sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.stable.err sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.stable.out sql/test/BugTracker-2015/Tests/leftjoin.Bug-3720.sql sql/test/BugTracker-2015/Tests/leftjoin.Bug-3720.stable.err sql/test/BugTracker-2015/Tests/leftjoin.Bug-3720.stable.out sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.sql sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.stable.err sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.stable.out sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.sql sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.err sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.out sql/test/BugTracker-2015/Tests/string_split.Bug-3564.sql sql/test/BugTracker-2015/Tests/string_split.Bug-3564.stable.err sql/test/BugTracker-2015/Tests/string_split.Bug-3564.stable.out sql/test/BugTracker-2015/Tests/true_or_predicate.Bug-3733.sql sql/test/BugTracker-2015/Tests/true_or_predicate.Bug-3733.stable.err sql/test/BugTracker-2015/Tests/true_or_predicate.Bug-3733.stable.out sql/test/BugTracker-2015/Tests/union_project.Bug-3723.sql sql/test/BugTracker-2015/Tests/union_project.Bug-3723.stable.err sql/test/BugTracker-2015/Tests/union_project.Bug-3723.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/mergedrop1.sql sql/test/mergetables/Tests/mergedrop1.stable.err sql/test/mergetables/Tests/mergedrop1.stable.out sql/test/mergetables/Tests/mergedrop2.sql sql/test/mergetables/Tests/mergedrop2.stable.err sql/test/mergetables/Tests/mergedrop2.stable.out sql/test/mergetables/Tests/mergedropcrash.sql sql/test/mergetables/Tests/mergedropcrash.stable.err sql/test/mergetables/Tests/mergedropcrash.stable.out sql/test/mergetables/Tests/mergequery.stable.out.single sql/test/remote/Tests/partition_elim.sql sql/test/remote/Tests/partition_elim.stable.err sql/test/remote/Tests/partition_elim.stable.out sql/test/remote/Tests/ssbm.stable.out.int128 tools/mserver/monetdblogo.png tools/mserver/tomographintro.docx tools/mserver/tomographintro.pdf 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_fits_geom.malC.src clients/Tests/MAL-signatures_fits_geom.stable.err clients/Tests/MAL-signatures_geom.malC.src clients/Tests/MAL-signatures_geom.stable.err clients/Tests/MAL-signatures_none.malC.src clients/Tests/MAL-signatures_none.stable.err 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.int128 clients/Tests/SQL-dump_all.stable.out.oid32 clients/Tests/SQL-dump_all.stable.out.oid32.int128 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/jdbc/tests/Tests/Test_Dobjects_bam.stable.out 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_bam.stable.out.int128 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.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_bam.stable.out.int128 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_bam.stable.out.int128 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_bam.stable.out.int128 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_bam.stable.out.int128 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_bam.stable.out.int128 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 NT/wincompile.py NT/winconfig.py 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/R/Tests/dplyr.R clients/Tests/All clients/Tests/exports.stable.out clients/mapiclient/Tests/All clients/mapiclient/Tests/mclient--help.stable.err clients/mapiclient/Tests/mclient--help.stable.err.Windows clients/mapiclient/Tests/tomograph--help.stable.err clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h clients/mapiclient/mclient.c clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/mapilib/mapi.c clients/mapilib/mapi.rc clients/nodejs/Tests/nodetest.js clients/nodejs/monetdb/mapiclient.js clients/nodejs/monetdb/package.json 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 common/stream/stream.c configure.ag debian/changelog debian/control gdk/ChangeLog-Archive gdk/ChangeLog.Oct2014 gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_atomic.h gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_bbp.h gdk/gdk_calc.c gdk/gdk_calc.h gdk/gdk_calc_compare.h gdk/gdk_calc_private.h gdk/gdk_cross.c gdk/gdk_delta.c gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_join_legacy.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_search.c gdk/gdk_search.h gdk/gdk_select.c gdk/gdk_setop.c gdk/gdk_storage.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_tm.c gdk/gdk_utils.c gdk/gdk_value.c gdk/libbat.rc geom/monetdb5/geom.c geom/monetdb5/geom.mal geom/sql/40_geom.sql java/Makefile.ag java/build.properties java/pom.xml java/release.txt libversions monetdb5/extras/rapi/rapi.c 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_atom.c monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_function.c monetdb5/mal/mal_http_daemon.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_parser.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_recycle.c monetdb5/mal/mal_resource.c monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/color.mal monetdb5/modules/atoms/inet.mal monetdb5/modules/atoms/json.c monetdb5/modules/atoms/json.mal monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/atoms/mtime.mal monetdb5/modules/atoms/str.c monetdb5/modules/atoms/str.h monetdb5/modules/atoms/str.mal monetdb5/modules/atoms/url.mal monetdb5/modules/atoms/uuid.c monetdb5/modules/atoms/uuid.mal monetdb5/modules/atoms/xml.mal monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/logger.c monetdb5/modules/kernel/microbenchmark.c monetdb5/modules/mal/Tests/inspect00.stable.out monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/calc.c monetdb5/modules/mal/joinpath.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/mdb.mal monetdb5/modules/mal/pcre.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tokenizer.c monetdb5/modules/mal/transaction.c monetdb5/modules/mal/txtsim.c monetdb5/optimizer/opt_pushselect.c 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/Tests/rapi12.sql sql/backends/monet5/bam/Tests/bam_loader_file.stable.out sql/backends/monet5/bam/Tests/mergetable.stable.out sql/backends/monet5/bam/bam_loader.c sql/backends/monet5/generator/Tests/generator00.stable.out sql/backends/monet5/generator/Tests/rangejoin.stable.out sql/backends/monet5/generator/generator.c sql/backends/monet5/gsl/Tests/gsl01.stable.out sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_gencode.h sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_optimizer.h sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/Makefile.ag sql/benchmarks/nobench/Tests/nobench.stable.out sql/benchmarks/ssbm/Tests/01-plan.stable.out sql/benchmarks/ssbm/Tests/02-plan.stable.out sql/benchmarks/ssbm/Tests/03-plan.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-plan.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-plan.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/06-plan.stable.out sql/benchmarks/ssbm/Tests/07-plan.stable.out sql/benchmarks/ssbm/Tests/08-plan.stable.out sql/benchmarks/ssbm/Tests/09-plan.stable.out sql/benchmarks/ssbm/Tests/10-plan.stable.out sql/benchmarks/ssbm/Tests/11-plan.stable.out sql/benchmarks/ssbm/Tests/12-plan.stable.out sql/benchmarks/ssbm/Tests/13-plan.stable.out sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/01.stable.out sql/benchmarks/tpch/LOCKED/Tests/14.stable.out.int128 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-22.stable.out.int128 sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/01.stable.out sql/benchmarks/tpch/Tests/02-plan.stable.out sql/benchmarks/tpch/Tests/03-plan.stable.out sql/benchmarks/tpch/Tests/03-plan.stable.out.int128 sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-plan.stable.out sql/benchmarks/tpch/Tests/05-plan.stable.out.int128 sql/benchmarks/tpch/Tests/07-plan.stable.out sql/benchmarks/tpch/Tests/07-plan.stable.out.int128 sql/benchmarks/tpch/Tests/08-plan.stable.out sql/benchmarks/tpch/Tests/08-plan.stable.out.int128 sql/benchmarks/tpch/Tests/09-plan.stable.out sql/benchmarks/tpch/Tests/09-plan.stable.out.int128 sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 sql/benchmarks/tpch/Tests/11-plan.stable.out sql/benchmarks/tpch/Tests/11-plan.stable.out.int128 sql/benchmarks/tpch/Tests/12-plan.stable.out sql/benchmarks/tpch/Tests/13-plan.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/14-plan.stable.out sql/benchmarks/tpch/Tests/14-plan.stable.out.int128 sql/benchmarks/tpch/Tests/14.stable.out.int128 sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/16-plan.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/17-plan.stable.out sql/benchmarks/tpch/Tests/17-plan.stable.out.int128 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/19-plan.stable.out sql/benchmarks/tpch/Tests/19-plan.stable.out.int128 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/20-plan.stable.out.int128 sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/21-plan.stable.out sql/benchmarks/tpch/Tests/22-explain.stable.out sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-plan.stable.out sql/benchmarks/tpch/Tests/22.stable.out sql/common/sql_types.c sql/include/sql_mem.h sql/include/sql_relation.h 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/10_math.sql sql/scripts/12_url.sql sql/scripts/13_date.sql sql/scripts/14_inet.sql sql/scripts/15_querylog.sql sql/scripts/16_tracelog.sql sql/scripts/21_dependency_functions.sql sql/scripts/22_clients.sql sql/scripts/25_debug.sql sql/scripts/39_analytics.sql sql/scripts/40_json.sql sql/scripts/75_storagemodel.sql sql/scripts/80_statistics.sql sql/scripts/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_schema.c sql/server/rel_select.c sql/server/rel_select.h sql/server/rel_semantic.c sql/server/rel_semantic.h sql/server/rel_updates.c sql/server/sql_atom.c sql/server/sql_atom.h sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_parser.y sql/server/sql_scan.c sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_table.c sql/storage/bat/bat_utils.c sql/storage/sql_catalog.c sql/storage/store.c sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.out sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.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-2010/Tests/offset_limited_32bit.SF-2950579.stable.out sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.oid32 sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128 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/alter_resets_readonly.Bug-3362.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-2013/Tests/swapped_likejoin.Bug-3375.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/ifthenelse.Bug-3546.stable.out sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3546.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/case_aggr.Bug-3705.sql sql/test/BugTracker-2015/Tests/case_aggr.Bug-3705.stable.out 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/insert_into_merge_table_crash.Bug-3703.stable.out sql/test/BugTracker-2015/Tests/is_null_limit.Bug-3684.stable.out sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.err sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.sql sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.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/BugTracker-2015/Tests/with-columns-mismatch.Bug-3697.stable.out sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/BugTracker/Tests/like_exp.SF-1613949.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/DropCascade/Tests/drop_columns_cascade.stable.out sql/test/DropCascade/Tests/drop_pkey_cascade.stable.out 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/Tests/trace.sql sql/test/Tests/trace.stable.out.int128 sql/test/Triggers/trigger_activation.sql 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/case_cast-bug-sf-1019506.stable.out sql/test/bugs/Tests/crash_order_by.stable.out sql/test/bugs/Tests/groupby_having-bug-sf-947600.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/select_orderby_alias-bug-sf-1024615.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/alter.stable.err 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/alter_table.sql 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/timestamptz.stable.out sql/test/pg_regress/Tests/without_oid.sql 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 sql/test/testdb-upgrade-chain/Tests/package.py sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb/Tests/testdb-package.py testing/Mtest.py.in testing/malcheck.py tools/mserver/Makefile.ag vertoo.data Branch: datacell Log Message:
Merge with default Resolve a few (mostly test-related) conflicts diffs (truncated from 219707 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -589,3 +589,10 @@ 6607367487d91eb02c5eb7dfb9d96606f8f7c6f0 e3d0eecdc35dc633fdd89157ba704f60f03756c1 Oct2014_9 d98df578687e677ae3abbc0ba41e3bb0631ef08a Oct2014_SP2_release c80c3439c5d7b2bddb710e584eb0936adc21d462 MonetDB.R-0.9.6 +0529873485e7ec8e4c723f8bf7fc14020a7390b2 Oct2014_11 +f59ba5dedd0122403ab175cd1d44a88ab6b3be02 Oct2014_SP3_release +027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_13 +027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_SP4_release +a1a48562a4651b1beb3168290777cbeb91f474d8 Oct2014_15 +027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_SP4_release +a1a48562a4651b1beb3168290777cbeb91f474d8 Oct2014_SP4_release 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-SP4/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -160,7 +160,9 @@ more client packages. %package devel Summary: MonetDB development files Group: Applications/Databases -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-stream-devel%{?_isa} = %{version}-%{release} +Requires: libatomic_ops-devel %description devel MonetDB is a database management system that is developed from a @@ -199,7 +201,7 @@ various other components. %package stream-devel Summary: MonetDB stream library Group: Applications/Databases -Requires: %{name}-stream = %{version}-%{release} +Requires: %{name}-stream%{?_isa} = %{version}-%{release} Requires: bzip2-devel Requires: libcurl-devel Requires: zlib-devel @@ -247,7 +249,7 @@ MonetDB, you will very likely need this %package client-tools Summary: MonetDB - Monet Database Management System Client Programs Group: Applications/Databases -Requires: %{name}-client = %{version}-%{release} +Requires: %{name}-client%{?_isa} = %{version}-%{release} %description client-tools MonetDB is a database management system that is developed from a @@ -267,8 +269,8 @@ tools can be used to monitor the MonetDB %package client-devel Summary: MonetDB - Monet Database Management System Client Programs Group: Applications/Databases -Requires: %{name}-client = %{version}-%{release} -Requires: %{name}-stream-devel = %{version}-%{release} +Requires: %{name}-client%{?_isa} = %{version}-%{release} +Requires: %{name}-stream-devel%{?_isa} = %{version}-%{release} Requires: openssl-devel %description client-devel @@ -290,7 +292,7 @@ This package contains the files needed t %package client-odbc Summary: MonetDB ODBC driver Group: Applications/Databases -Requires: %{name}-client = %{version}-%{release} +Requires: %{name}-client%{?_isa} = %{version}-%{release} Requires(pre): unixODBC %description client-odbc @@ -347,7 +349,6 @@ program. %package client-perl Summary: MonetDB perl interface Group: Applications/Databases -Requires: %{name}-client = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(DBI) Requires: perl(Digest::SHA) @@ -426,12 +427,12 @@ This package contains the activerecord a %package client-tests Summary: MonetDB Client tests package Group: Applications/Databases -Requires: MonetDB5-server = %{version}-%{release} -Requires: %{name}-client = %{version}-%{release} -Requires: %{name}-client-odbc = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} +Requires: %{name}-client%{?_isa} = %{version}-%{release} +Requires: %{name}-client-odbc%{?_isa} = %{version}-%{release} Requires: %{name}-client-perl = %{version}-%{release} Requires: %{name}-client-php = %{version}-%{release} -Requires: %{name}-SQL-server5 = %{version}-%{release} +Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release} Requires: python-monetdb = %{version}-%{release} %description client-tests @@ -464,7 +465,7 @@ developer. %package geom-MonetDB5 Summary: MonetDB5 SQL GIS support module Group: Applications/Databases -Requires: MonetDB5-server = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} Obsoletes: %{name}-geom Obsoletes: %{name}-geom-devel @@ -488,7 +489,7 @@ extensions for %{name}-SQL-server5. %package gsl-MonetDB5 Summary: MonetDB5 SQL interface to the gsl library Group: Applications/Databases -Requires: MonetDB5-server = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} %description gsl-MonetDB5 MonetDB is a database management system that is developed from a @@ -510,7 +511,7 @@ numerical analysis (gsl). %package bam-MonetDB5 Summary: MonetDB5 SQL interface to the bam library Group: Applications/Databases -Requires: MonetDB5-server = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} %description bam-MonetDB5 MonetDB is a database management system that is developed from a @@ -533,7 +534,7 @@ version of Sequence Alignment/Map) data. %package R Summary: Integration of MonetDB and R, allowing use of R from within SQL Group: Applications/Databases -Requires: MonetDB-SQL-server5 = %{version}-%{release} +Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release} %description R MonetDB is a database management system that is developed from a @@ -559,7 +560,7 @@ install it. %package cfitsio Summary: MonetDB: Add on module that provides support for FITS files Group: Applications/Databases -Requires: MonetDB-SQL-server5 = %{version}-%{release} +Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release} %description cfitsio MonetDB is a database management system that is developed from a @@ -582,7 +583,7 @@ format. Summary: MonetDB - Monet Database Management System Group: Applications/Databases Requires(pre): shadow-utils -Requires: %{name}-client = %{version}-%{release} +Requires: %{name}-client%{?_isa} = %{version}-%{release} Obsoletes: MonetDB5-server-rdf %description -n MonetDB5-server @@ -667,7 +668,7 @@ fi %package -n MonetDB5-server-hugeint Summary: MonetDB - 128-bit integer support for MonetDB5-server Group: Application/Databases -Requires: MonetDB5-server +Requires: MonetDB5-server%{?_isa} %description -n MonetDB5-server-hugeint MonetDB is a database management system that is developed from a @@ -687,7 +688,8 @@ MonetDB5-server component. %package -n MonetDB5-server-devel Summary: MonetDB development files Group: Applications/Databases -Requires: MonetDB5-server = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description -n MonetDB5-server-devel MonetDB is a database management system that is developed from a @@ -708,7 +710,7 @@ used from the MAL level. %package SQL-server5 Summary: MonetDB5 SQL server modules Group: Applications/Databases -Requires: MonetDB5-server = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 # RHEL >= 7, and all current Fedora Requires: %{_bindir}/systemd-tmpfiles @@ -774,8 +776,8 @@ systemd-tmpfiles --create %{_sysconfdir} %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} +Requires: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release} +Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release} %description SQL-server5-hugeint MonetDB is a database management system that is developed from a @@ -910,7 +912,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 \ @@ -943,38 +944,119 @@ 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 +* Wed Jun 03 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.15-20150603 +- Rebuilt. +- BZ#3707: var() possibly not working in debug builds +- BZ#3720: Incorrect results on joining with same table +- BZ#3725: LEFT JOIN bug with CONST value +- BZ#3731: left shift for IP addresses not available to non-system users + +* Tue May 19 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.13-20150519 +- Rebuilt. +- BZ#3712: Concurrency issue on querying the SQL catalog +- BZ#3713: Long startup cost for simple session +- BZ#3715: Crash with two ALTER TABLE statements in a transaction +- BZ#3718: Adding and dropping a non existing tablename to/from a merge + table is accepted without an error +- BZ#3719: Assertion failure in /MonetDB-11.19.11/gdk/gdk_bat.c:2841: + BATassertHeadProps: Assertion `!b->H->key || cmp != 0' failed. +- BZ#3723: Assertion failure in rel_bin.c:2548: rel2bin_groupby: Assertion + `0' failed. + +* 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 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
