Changeset: cd1bd934f0e5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cd1bd934f0e5 Added Files: monetdb5/mal/Tests/tst059.mal monetdb5/mal/Tests/tst059.stable.err monetdb5/mal/Tests/tst059.stable.out sql/backends/monet5/bam/default_schema.dia sql/backends/monet5/bam/default_schema.png sql/backends/monet5/bam/metadata.dia sql/backends/monet5/bam/metadata.png sql/backends/monet5/bam/paired_schema.dia sql/backends/monet5/bam/paired_schema.png sql/backends/monet5/generator/Tests/rangejoin.sql sql/backends/monet5/generator/Tests/rangejoin.stable.err sql/backends/monet5/generator/Tests/rangejoin.stable.out sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.err.int128 sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.out.int128 sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.sql sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.stable.err sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.stable.out sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.sql sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.stable.err sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.stable.out sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.sql sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err.int128 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-3629.sql sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.err sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.out sql/test/BugTracker-2014/Tests/incorrect_floating_point_cast.Bug-3633.sql sql/test/BugTracker-2014/Tests/incorrect_floating_point_cast.Bug-3633.stable.err sql/test/BugTracker-2014/Tests/incorrect_floating_point_cast.Bug-3633.stable.out sql/test/BugTracker-2014/Tests/inet_error_handling.Bug-3624.sql sql/test/BugTracker-2014/Tests/inet_error_handling.Bug-3624.stable.err sql/test/BugTracker-2014/Tests/inet_error_handling.Bug-3624.stable.out sql/test/BugTracker-2014/Tests/missing_alias.Bug-3626.sql sql/test/BugTracker-2014/Tests/missing_alias.Bug-3626.stable.err sql/test/BugTracker-2014/Tests/missing_alias.Bug-3626.stable.out sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.sql sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.err sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.out sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.sql sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.stable.err sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.stable.out sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.sql sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.stable.err sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.stable.out sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.sql sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.out sql/test/BugTracker-2014/Tests/type_resolution.Bug-3622.sql sql/test/BugTracker-2014/Tests/type_resolution.Bug-3622.stable.err sql/test/BugTracker-2014/Tests/type_resolution.Bug-3622.stable.out sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.sql sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.err sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.out sql/test/mergetables/Tests/alter.stable.err sql/test/mergetables/Tests/alter.stable.out sql/test/mergetables/Tests/types.stable.err sql/test/mergetables/Tests/types.stable.out sql/test/pg_regress/Tests/loadwisconsin.stable.err sql/test/pg_regress/Tests/loadwisconsin.stable.out Modified Files: .hgignore .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/conf/rules.mk buildtools/doc/windowsbuild.rst clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_all.stable.out.int128 clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out.int128 clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out.int128 clients/Tests/MAL-signatures_none.stable.out clients/Tests/MAL-signatures_none.stable.out.int128 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.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.stable.out clients/Tests/SQL-dump_none.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/tomograph.c clients/mapilib/mapi.rc clients/odbc/driver/ODBC.syms clients/odbc/driver/SQLGetConnectAttr.c clients/odbc/driver/SQLGetConnectOption.c clients/odbc/driver/SQLSetConnectOption.c clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py common/stream/stream.c common/utils/mutils.c configure.ag debian/changelog gdk/ChangeLog-Archive gdk/ChangeLog.Oct2014 gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_private.h gdk/gdk_select.c gdk/libbat.rc java/Makefile.ag java/build.properties java/pom.xml java/release.txt libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Oct2014 monetdb5/mal/Tests/All monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_profiler.c monetdb5/modules/atoms/Tests/inet01.mal monetdb5/modules/atoms/Tests/inet01.stable.out monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/inet.mal monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/modules/kernel/mmath.c monetdb5/modules/kernel/mmath.h monetdb5/modules/mal/sysmon.c monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_generator.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_querylog.c monetdb5/optimizer/opt_wrapper.c monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive sql/ChangeLog.Oct2014 sql/backends/monet5/Tests/limithack.stable.out sql/backends/monet5/Tests/simpleSQL.stable.out sql/backends/monet5/bam/bam_lib.c sql/backends/monet5/bam/bam_lib.h sql/backends/monet5/generator/Tests/All sql/backends/monet5/generator/Tests/generator03.stable.out sql/backends/monet5/generator/generator.c sql/backends/monet5/generator/generator.h sql/backends/monet5/generator/generator.mal sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/benchmarks/nobench/Tests/nobench.stable.out 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/17-explain.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/17-plan.stable.out sql/benchmarks/tpch/Tests/17-plan.stable.out.int128 sql/benchmarks/tpch/Tests/20-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-plan.stable.out sql/benchmarks/tpch/Tests/20-plan.stable.out.int128 sql/benchmarks/tpch/Tests/22-explain.stable.out sql/benchmarks/tpch/Tests/22-explain.stable.out.int128 sql/benchmarks/tpch/Tests/22-plan.stable.out sql/common/sql_types.c sql/common/sql_types.h sql/jdbc/tests/Tests/Test_PSsqldata.stable.out sql/scripts/80_statistics.sql sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_mvc.h sql/server/sql_parser.y sql/server/sql_semantic.c sql/storage/store.c sql/test/ADT2006/Tests/bram.stable.out sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err sql/test/BugDay_2005-10-06_2.9.3/Tests/cast_to_interval.SF-1019079.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/multiple_select_cast.SF-938419.stable.out sql/test/BugDay_2005-12-19_2.9.3/Tests/NULL_in_CASE.SF-1211335.stable.out sql/test/BugDay_2005-12-19_2.9.3/Tests/cast_bigint_to_int.SF-1211903.stable.out sql/test/BugDay_2005-12-19_2.9.3/Tests/cast_interval.SF.1280682.stable.out sql/test/BugDay_2005-12-19_2.9.3/Tests/timestamp_fraction.SF-1357342.stable.out sql/test/BugTracker-2008/Tests/decimal_cast_in_view.SF-2075223.stable.out sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.sql sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.err sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.out sql/test/BugTracker-2010/Tests/join_problem.Bug-2694.stable.out sql/test/BugTracker-2011/Tests/Multiplication_and_cast.Bug-2923.stable.out sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.err.Windows sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.out.Windows sql/test/BugTracker-2012/Tests/incorrect_cast_from_double_to_int.Bug-2579.stable.err sql/test/BugTracker-2012/Tests/incorrect_cast_from_double_to_int.Bug-2579.stable.out sql/test/BugTracker-2012/Tests/interval_timestamp.Bug-3002.stable.err sql/test/BugTracker-2013/Tests/bogus_aggregation_casts.Bug-3342.stable.out sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.stable.out sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out.int128 sql/test/BugTracker-2014/Tests/All sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.err sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.err sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out sql/test/BugTracker/Tests/case_in_aggr_bug.SF-1506545.stable.out sql/test/BugTracker/Tests/cast_interval2time.SF-1488247.stable.out sql/test/BugTracker/Tests/convert_dec2varchar.SF-1774312.stable.out sql/test/BugTracker/Tests/crash_on_cast.SF-1357271.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/Dependencies/Tests/Dependencies_bam.stable.out sql/test/Dependencies/Tests/Dependencies_bam.stable.out.int128 sql/test/Tests/coalesce.stable.err sql/test/Tests/coalesce.stable.out sql/test/VOC/Tests/VOC.stable.out sql/test/bugs/Tests/aggr_single_value.stable.out sql/test/bugs/Tests/aggr_single_value.stable.out.int128 sql/test/bugs/Tests/case_substring.stable.out sql/test/bugs/Tests/cast_bool2int-bug-sf-1000576.stable.out sql/test/bugs/Tests/cast_bool2int-bug-sf-951800.stable.out sql/test/bugs/Tests/cast_varchar2int-bug-sf-964165.stable.out sql/test/bugs/Tests/float2dec.stable.out sql/test/bugs/Tests/float_arith_cast2int-bug-sf-949255.stable.out sql/test/bugs/Tests/interval_convert_bugs-sf-1274077-1274085.stable.out sql/test/bugs/Tests/timestamp_comparison-bug-sf-1158581.stable.out sql/test/json/Tests/coercions.stable.out sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check0.stable.out.int128 sql/test/leaks/Tests/check0_bam.stable.out sql/test/leaks/Tests/check0_bam.stable.out.int128 sql/test/leaks/Tests/check0_gsl.stable.out.int128 sql/test/leaks/Tests/check0_nogeom.stable.out sql/test/leaks/Tests/check0_nogeom.stable.out.int128 sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check1_bam.stable.out sql/test/leaks/Tests/check1_bam.stable.out.int128 sql/test/leaks/Tests/check1_gsl.stable.out.int128 sql/test/leaks/Tests/check1_nogeom.stable.out sql/test/leaks/Tests/check1_nogeom.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check2_bam.stable.out sql/test/leaks/Tests/check2_bam.stable.out.int128 sql/test/leaks/Tests/check2_gsl.stable.out.int128 sql/test/leaks/Tests/check2_nogeom.stable.out sql/test/leaks/Tests/check2_nogeom.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check3_bam.stable.out sql/test/leaks/Tests/check3_bam.stable.out.int128 sql/test/leaks/Tests/check3_gsl.stable.out.int128 sql/test/leaks/Tests/check3_nogeom.stable.out sql/test/leaks/Tests/check3_nogeom.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check4_bam.stable.out sql/test/leaks/Tests/check4_bam.stable.out.int128 sql/test/leaks/Tests/check4_gsl.stable.out.int128 sql/test/leaks/Tests/check4_nogeom.stable.out sql/test/leaks/Tests/check4_nogeom.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 sql/test/leaks/Tests/check5_bam.stable.out sql/test/leaks/Tests/check5_bam.stable.out.int128 sql/test/leaks/Tests/check5_gsl.stable.out.int128 sql/test/leaks/Tests/check5_nogeom.stable.out sql/test/leaks/Tests/check5_nogeom.stable.out.int128 sql/test/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/drop3.stable.out.int128 sql/test/leaks/Tests/drop3_bam.stable.out sql/test/leaks/Tests/drop3_bam.stable.out.int128 sql/test/leaks/Tests/drop3_gsl.stable.out.int128 sql/test/leaks/Tests/drop3_nogeom.stable.out sql/test/leaks/Tests/drop3_nogeom.stable.out.int128 sql/test/leaks/Tests/select1.stable.out sql/test/leaks/Tests/select1.stable.out.int128 sql/test/leaks/Tests/select1_bam.stable.out sql/test/leaks/Tests/select1_bam.stable.out.int128 sql/test/leaks/Tests/select1_gsl.stable.out.int128 sql/test/leaks/Tests/select1_nogeom.stable.out sql/test/leaks/Tests/select1_nogeom.stable.out.int128 sql/test/leaks/Tests/select2.stable.out sql/test/leaks/Tests/select2.stable.out.int128 sql/test/leaks/Tests/select2_bam.stable.out sql/test/leaks/Tests/select2_bam.stable.out.int128 sql/test/leaks/Tests/select2_gsl.stable.out.int128 sql/test/leaks/Tests/select2_nogeom.stable.out sql/test/leaks/Tests/select2_nogeom.stable.out.int128 sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp1.stable.out.int128 sql/test/leaks/Tests/temp1_bam.stable.out sql/test/leaks/Tests/temp1_bam.stable.out.int128 sql/test/leaks/Tests/temp1_gsl.stable.out.int128 sql/test/leaks/Tests/temp1_nogeom.stable.out sql/test/leaks/Tests/temp1_nogeom.stable.out.int128 sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp2.stable.out.int128 sql/test/leaks/Tests/temp2_bam.stable.out sql/test/leaks/Tests/temp2_bam.stable.out.int128 sql/test/leaks/Tests/temp2_gsl.stable.out.int128 sql/test/leaks/Tests/temp2_nogeom.stable.out sql/test/leaks/Tests/temp2_nogeom.stable.out.int128 sql/test/leaks/Tests/temp3.stable.out sql/test/leaks/Tests/temp3.stable.out.int128 sql/test/leaks/Tests/temp3_bam.stable.out sql/test/leaks/Tests/temp3_bam.stable.out.int128 sql/test/leaks/Tests/temp3_gsl.stable.out.int128 sql/test/leaks/Tests/temp3_nogeom.stable.out sql/test/leaks/Tests/temp3_nogeom.stable.out.int128 sql/test/pg_regress/Tests/All sql/test/pg_regress/Tests/alter_table.sql sql/test/pg_regress/Tests/alter_table.stable.err sql/test/pg_regress/Tests/alter_table.stable.out sql/test/pg_regress/Tests/arrays.stable.err sql/test/pg_regress/Tests/boolean.stable.err sql/test/pg_regress/Tests/boolean.stable.out sql/test/pg_regress/Tests/case.stable.err sql/test/pg_regress/Tests/case.stable.out sql/test/pg_regress/Tests/char.stable.err sql/test/pg_regress/Tests/char.stable.out sql/test/pg_regress/Tests/comments.stable.err sql/test/pg_regress/Tests/create_aggregate.stable.err sql/test/pg_regress/Tests/create_misc.stable.err sql/test/pg_regress/Tests/create_misc.stable.out sql/test/pg_regress/Tests/create_operator.stable.err sql/test/pg_regress/Tests/create_table.sql sql/test/pg_regress/Tests/create_table.stable.err sql/test/pg_regress/Tests/date.stable.err sql/test/pg_regress/Tests/date.stable.out sql/test/pg_regress/Tests/drop.stable.err 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.out sql/test/pg_regress/Tests/inet.stable.err sql/test/pg_regress/Tests/inet.stable.out sql/test/pg_regress/Tests/insert.stable.err sql/test/pg_regress/Tests/int2.stable.err sql/test/pg_regress/Tests/int2.stable.out sql/test/pg_regress/Tests/int4.stable.err sql/test/pg_regress/Tests/int4.stable.out sql/test/pg_regress/Tests/int8.stable.err sql/test/pg_regress/Tests/int8.stable.out sql/test/pg_regress/Tests/interval.stable.err sql/test/pg_regress/Tests/interval.stable.out sql/test/pg_regress/Tests/limit.stable.err sql/test/pg_regress/Tests/limit.stable.out sql/test/pg_regress/Tests/load.SQL.sh sql/test/pg_regress/Tests/numeric.stable.err sql/test/pg_regress/Tests/numeric.stable.out sql/test/pg_regress/Tests/numeric_big.stable.err sql/test/pg_regress/Tests/numerology.stable.err sql/test/pg_regress/Tests/oid.stable.err sql/test/pg_regress/Tests/random.stable.out sql/test/pg_regress/Tests/reltime.stable.out sql/test/pg_regress/Tests/select_into.stable.err sql/test/pg_regress/Tests/strings.stable.err sql/test/pg_regress/Tests/strings.stable.out sql/test/pg_regress/Tests/strings_cast.stable.err sql/test/pg_regress/Tests/strings_cast.stable.out sql/test/pg_regress/Tests/strings_concat.stable.err sql/test/pg_regress/Tests/text.stable.out sql/test/pg_regress/Tests/timestamp.sql sql/test/pg_regress/Tests/timestamp.stable.err sql/test/pg_regress/Tests/timestamp.stable.out sql/test/pg_regress/Tests/timestamptz.sql sql/test/pg_regress/Tests/timestamptz.stable.err sql/test/pg_regress/Tests/timestamptz.stable.out sql/test/pg_regress/Tests/timetz.stable.out sql/test/pg_regress/Tests/vacuum.sql sql/test/pg_regress/Tests/vacuum.stable.out sql/test/pg_regress/Tests/varchar.stable.err sql/test/pg_regress/Tests/without_oid.sql sql/test/pg_regress/Tests/without_oid.stable.err sql/test/pg_regress/Tests/without_oid.stable.out sql/test/snodgrass/Tests/cast_select.stable.out sql/test/testdb-upgrade-chain/Tests/dump.stable.out sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/dump.stable.out.Windows vertoo.data Branch: geo Log Message:
Merge with default branch. diffs (truncated from 100862 to 300 lines): diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -22,6 +22,7 @@ Makefile.msc aclocal.m4 acout.in autom4te.cache +buildtools/conf/compile buildtools/conf/config.guess buildtools/conf/config.sub buildtools/conf/install-sh diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -576,9 +576,13 @@ 6830d0b9c31fe23954c75014a581f145c7a551ff 0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release 6c7d5f562fcb044b745c871344c25b1c6bab7cf4 Jan2014_SP3_release 3899334ca1f3c13924e8bd22d2afab8ab468e5ba Oct2014_root -8fe68871d7b4f2a66fde51c783b1689ee706b4ae pbsm +0dd4a291a01def38d0d2f0a96559ea8c73a56b3f Oct2014_1 4f894ebf1a93ae895ec23d54ce2112bf21a6427e Oct2014_release e92e434d19b7308c2952d50978c2cfd78e1bdb80 Oct2014_3 4f894ebf1a93ae895ec23d54ce2112bf21a6427e Oct2014_release 88a29a5a2bef5c6cef6b3bfa5ab7c4d3b855a2c8 Oct2014_release -0cc4f935d6481ae694fba9abface0a92bf75b278 imprints +eb2967c408350131b63f5393704fd697c701fc49 Oct2014_5 +2da8cbcb65ed56690bad29f089d996eac347b48d Oct2014_SP1_release +ee3d8e3af6aae6be6cfaa876a379a0751f164e97 Oct2014_7 +2da8cbcb65ed56690bad29f089d996eac347b48d Oct2014_SP1_release +6607367487d91eb02c5eb7dfb9d96606f8f7c6f0 Oct2014_SP1_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/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Oct2014-SP1/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -960,6 +960,48 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD rm -fr $RPM_BUILD_ROOT %changelog +* Fri Nov 21 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.7-20141121 +- Rebuilt. + +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- Rebuilt. +- BZ#3580: cosmetic change (append newline) +- BZ#3609: Incorrect use of generate_series +- BZ#3611: quantile() and median() commands crash when used 2x on the + same variable on a null table +- BZ#3612: assertion failure when deleting rows from table to which a + FK constraint is defined +- BZ#3620: ORDER BY broken when using UNION ALL +- BZ#3621: Hexadecimal literal vs decimal literal + +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- gdk: Implemented a change to the way in which string bats are appended. + We now try harder to limit the growth of the string heap. + +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- monetdb5: Fixed adding of 0 intervals to dates. + +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- sql: Fixed sys.queue() implementation to report on other queries being + executed. + +* Fri Nov 14 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- sql: A number of bugs were fixed in the code to upgrade a database from + previous releases. This version should fix the upgrade of a database + that had been upgraded to the Oct2014 release, but also properly + upgrade directly from Jan2014 and Feb2013 releases. + +* Fri Nov 7 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- buildtools: The libraries included in the Windows installers have been upgraded. + We now use libxml2-2.9.2, openssl-1.0.1j, pcre-8.36, and zlib-1.2.8. + +* Wed Nov 5 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- gdk: Fixed some problems with BATsample. It was possible for BATsample to + return a value that was just beyond the end of the sampled BAT. Also, + on some systems the range of the rand() function is rather limited + (0..32767) and trying to get a sample larger than this range would + result in an infinite loop. + * Tue Oct 28 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.3-20141028 - Rebuilt. 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 @@ -26,6 +26,7 @@ * _MSC_VER = 1400: Visual Studio 8 * _MSC_VER = 1500: Visual Studio 9.0 * _MSC_VER = 1600: Visual Studio 10.0 + * _MSC_VER = 1800: Visual Studio 12.0 */ /* Prevent pollution through excessive inclusion of include files by @@ -145,13 +146,17 @@ /* #undef HAVE_FDATASYNC */ /* Define to 1 if you have the <fenv.h> header file. */ -/* #undef HAVE_FENV_H */ +#if _MSC_VER > 1600 +#define HAVE_FENV_H 1 +#endif /* Define to 1 if you have the `fpclass' function. */ -#define HAVE_FPCLASS 1 +#define HAVE_FPCLASS 1 /* uses _fpclass, see mmath.c */ /* Define to 1 if you have the `fpclassify' function. */ -/* #undef HAVE_FPCLASSIFY */ +#if _MSC_VER > 1600 +#define HAVE_FPCLASSIFY 1 +#endif /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ /* #undef HAVE_FSEEKO */ @@ -226,7 +231,9 @@ #define HAVE_IO_H 1 /* Define to 1 if you have the `isinf' function. */ -/* #undef HAVE_ISINF */ +#if _MSC_VER > 1600 +#define HAVE_ISINF 1 +#endif /* Define that you want to build the jsonstore library */ /* #undef HAVE_JSONSTORE */ @@ -296,7 +303,9 @@ /* Define to 1 if you have the `llabs' function. */ #define HAVE_LLABS 1 +#if _MSC_VER <= 1500 #define llabs _abs64 +#endif /* Define to 1 if you have the <locale.h> header file. */ #define HAVE_LOCALE_H 1 @@ -310,7 +319,7 @@ /* #undef HAVE_LOCKF */ /* Define to 1 if the system has the type `long long'. */ -#if defined(__ICL) && __ICL >= 1010 +#if _MSC_VER > 1600 || (defined(__ICL) && __ICL >= 1010) #define HAVE_LONG_LONG 1 #else #if _MSC_VER >= 1300 @@ -318,8 +327,6 @@ * format is interpreted the same as %ld, i.e. useless */ /* #define HAVE_LONG_LONG 1 */ -#else -/* #undef HAVE_LONG_LONG */ #endif #endif @@ -368,6 +375,11 @@ /* Define to 1 if you have the `nl_langinfo' function. */ /* #undef HAVE_NL_LANGINFO */ +/* Define to 1 if you have the `nextafterf' function. */ +#if _MSC_VER > 1600 +#define HAVE_NEXTAFTERF 1 +#endif + /* Define to 1 if you have the `_NSGetExecutablePath' function. */ /* #undef HAVE__NSGETEXECUTABLEPATH */ @@ -445,7 +457,9 @@ /* #undef HAVE_RLIMIT_H */ /* Define to 1 if you have the `round' function. */ -/* #undef HAVE_ROUND */ +#if _MSC_VER > 1600 +#define HAVE_ROUND 1 +#endif /* Define if you have the samtools (providing the bam library) */ /* #undef HAVE_SAMTOOLS */ @@ -514,7 +528,9 @@ #define HAVE_STDDEF_H 1 /* Define to 1 if you have the <stdint.h> header file. */ -/* #undef HAVE_STDINT_H */ +#if _MSC_VER > 1600 +#define HAVE_STDINT_H 1 +#endif /* Define to 1 if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H 1 @@ -529,7 +545,9 @@ /* #undef HAVE_STRCASESTR */ /* Define to 1 if you have the `strftime' function. */ -/* #undef HAVE_STRFTIME */ +#if _MSC_VER >= 1500 +#define HAVE_STRFTIME 1 +#endif /* Define to 1 if you have the <strings.h> header file. */ /* #undef HAVE_STRINGS_H */ @@ -556,28 +574,26 @@ #define HAVE_STRTOD 1 /* Define to 1 if you have the `strtof' function. */ -/* #undef HAVE_STRTOF */ +#if _MSC_VER > 1600 +#define HAVE_STRTOF 1 +#endif #define strtok_r(t,d,c) strtok_s(t,d,c) /* Define to 1 if you have the `strtoll' function. */ #if _MSC_VER >= 1300 #define HAVE_STRTOLL 1 -#ifndef strtoll +#if _MSC_VER <= 1600 && !defined(strtoll) #define strtoll _strtoi64 #endif -#else -/* #undef HAVE_STRTOLL */ #endif /* Define to 1 if you have the `strtoull' function. */ #if _MSC_VER >= 1300 #define HAVE_STRTOULL 1 -#ifndef strtoull +#if _MSC_VER <= 1600 && !defined(strtoull) #define strtoull _strtoui64 #endif -#else -/* #undef HAVE_STRTOULL */ #endif /* Define if you have struct mallinfo */ @@ -652,7 +668,9 @@ #define HAVE_TIME_H 1 /* Define to 1 if you have the `trunc' function. */ -/* #undef HAVE_TRUNC */ +#if _MSC_VER > 1600 +#define HAVE_TRUNC 1 +#endif /* Define to 1 if you have the `uname' function. */ /* #undef HAVE_UNAME */ @@ -685,7 +703,9 @@ #define HAVE_WINSOCK_H 1 /* Define to 1 if you have the <xmmintrin.h> header file. */ -/* #undef HAVE_XMMINTRIN_H */ +#if _MSC_VER > 1600 +#define HAVE_XMMINTRIN_H 1 +#endif /* Define to 1 if the system has the type `_Bool'. */ /* #undef HAVE__BOOL */ @@ -999,8 +1019,10 @@ #define ssize_t int #endif +#if _MSC_VER <= 1600 /* no va_copy in win32 */ #define va_copy(x,y) ((x) = (y)) +#endif typedef unsigned char uint8_t; typedef unsigned short uint16_t; diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Fri Nov 7 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- The libraries included in the Windows installers have been upgraded. + We now use libxml2-2.9.2, openssl-1.0.1j, pcre-8.36, and zlib-1.2.8. + * Thu Apr 10 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.1-20141024 - Jacqueline, the MonetDB/JAQL frontend, has been removed. The frontend never grew beyond being experimental, and there is no interest anymore diff --git a/buildtools/ChangeLog.Oct2014 b/buildtools/ChangeLog.Oct2014 --- a/buildtools/ChangeLog.Oct2014 +++ b/buildtools/ChangeLog.Oct2014 @@ -1,7 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Fri Nov 7 2014 Sjoerd Mullender <sjo...@acm.org> -- The libraries included in the Windows installers have been upgraded. - We now use libxml2-2.9.2, openssl-1.0.1j, pcre-8.36, and zlib-1.2.8. - diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
