Changeset: ac8812900e15 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ac8812900e15 Added Files: monetdb5/modules/mal/Tests/pqueue2.stable.err monetdb5/modules/mal/Tests/pqueue2.stable.out monetdb5/modules/mal/Tests/pqueue3.stable.err monetdb5/modules/mal/Tests/pqueue3.stable.out sql/test/json/Tests/aggregate01.sql sql/test/json/Tests/aggregate01.stable.err sql/test/json/Tests/aggregate01.stable.out sql/test/pg_regress/Tests/abstime.sql sql/test/pg_regress/Tests/aggregates.sql sql/test/pg_regress/Tests/aggregates.stable.err sql/test/pg_regress/Tests/aggregates.stable.out 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.sql sql/test/pg_regress/Tests/arrays.stable.err sql/test/pg_regress/Tests/arrays.stable.out sql/test/pg_regress/Tests/bit.sql sql/test/pg_regress/Tests/bit.stable.err sql/test/pg_regress/Tests/bit.stable.out sql/test/pg_regress/Tests/boolean.sql sql/test/pg_regress/Tests/boolean.stable.err sql/test/pg_regress/Tests/boolean.stable.out sql/test/pg_regress/Tests/box.sql sql/test/pg_regress/Tests/box.stable.err sql/test/pg_regress/Tests/box.stable.out sql/test/pg_regress/Tests/btree_index.sql sql/test/pg_regress/Tests/btree_index.stable.err sql/test/pg_regress/Tests/btree_index.stable.out sql/test/pg_regress/Tests/case.sql sql/test/pg_regress/Tests/case.stable.err sql/test/pg_regress/Tests/case.stable.out sql/test/pg_regress/Tests/char.sql sql/test/pg_regress/Tests/circle.sql sql/test/pg_regress/Tests/circle.stable.err sql/test/pg_regress/Tests/circle.stable.out sql/test/pg_regress/Tests/cluster.sql sql/test/pg_regress/Tests/cluster.stable.err sql/test/pg_regress/Tests/cluster.stable.out sql/test/pg_regress/Tests/comments.sql sql/test/pg_regress/Tests/comments.stable.err sql/test/pg_regress/Tests/comments.stable.out sql/test/pg_regress/Tests/conversion.sql sql/test/pg_regress/Tests/conversion.stable.err sql/test/pg_regress/Tests/conversion.stable.out sql/test/pg_regress/Tests/copy2.sql sql/test/pg_regress/Tests/copy2.stable.err sql/test/pg_regress/Tests/copy2.stable.out sql/test/pg_regress/Tests/create_aggregate.sql sql/test/pg_regress/Tests/create_aggregate.stable.err sql/test/pg_regress/Tests/create_aggregate.stable.out sql/test/pg_regress/Tests/create_index.sql sql/test/pg_regress/Tests/create_index.stable.err sql/test/pg_regress/Tests/create_index.stable.out sql/test/pg_regress/Tests/create_misc.sql 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.sql sql/test/pg_regress/Tests/create_operator.stable.err sql/test/pg_regress/Tests/create_operator.stable.out sql/test/pg_regress/Tests/create_table.sql sql/test/pg_regress/Tests/create_table.stable.err sql/test/pg_regress/Tests/create_table.stable.out sql/test/pg_regress/Tests/create_type.sql sql/test/pg_regress/Tests/create_type.stable.err sql/test/pg_regress/Tests/create_type.stable.out sql/test/pg_regress/Tests/create_view.sql sql/test/pg_regress/Tests/create_view.stable.err sql/test/pg_regress/Tests/create_view.stable.out sql/test/pg_regress/Tests/date.sql sql/test/pg_regress/Tests/date.stable.err sql/test/pg_regress/Tests/date.stable.out sql/test/pg_regress/Tests/domain.sql sql/test/pg_regress/Tests/domain.stable.err sql/test/pg_regress/Tests/domain.stable.out sql/test/pg_regress/Tests/drop.sql sql/test/pg_regress/Tests/drop.stable.err sql/test/pg_regress/Tests/drop.stable.out sql/test/pg_regress/Tests/errors.sql sql/test/pg_regress/Tests/errors.stable.err sql/test/pg_regress/Tests/errors.stable.out sql/test/pg_regress/Tests/float4.sql sql/test/pg_regress/Tests/float4.stable.err sql/test/pg_regress/Tests/float4.stable.out sql/test/pg_regress/Tests/float8.sql sql/test/pg_regress/Tests/float8.stable.err sql/test/pg_regress/Tests/float8.stable.out sql/test/pg_regress/Tests/foreign_key.sql sql/test/pg_regress/Tests/foreign_key.stable.err sql/test/pg_regress/Tests/foreign_key.stable.out sql/test/pg_regress/Tests/geometry.sql sql/test/pg_regress/Tests/geometry.stable.err sql/test/pg_regress/Tests/geometry.stable.out sql/test/pg_regress/Tests/hash_index.sql sql/test/pg_regress/Tests/hash_index.stable.err sql/test/pg_regress/Tests/hash_index.stable.out sql/test/pg_regress/Tests/horology.sql sql/test/pg_regress/Tests/horology.stable.err sql/test/pg_regress/Tests/horology.stable.out sql/test/pg_regress/Tests/inet.sql sql/test/pg_regress/Tests/inet.stable.err sql/test/pg_regress/Tests/inet.stable.out sql/test/pg_regress/Tests/inherit.sql sql/test/pg_regress/Tests/inherit.stable.err sql/test/pg_regress/Tests/inherit.stable.out sql/test/pg_regress/Tests/insert.sql sql/test/pg_regress/Tests/insert.stable.err sql/test/pg_regress/Tests/insert.stable.out sql/test/pg_regress/Tests/int2.sql sql/test/pg_regress/Tests/int2.stable.err sql/test/pg_regress/Tests/int2.stable.out sql/test/pg_regress/Tests/int4.sql sql/test/pg_regress/Tests/int4.stable.err sql/test/pg_regress/Tests/int4.stable.out sql/test/pg_regress/Tests/int8.sql sql/test/pg_regress/Tests/int8.stable.err sql/test/pg_regress/Tests/int8.stable.out sql/test/pg_regress/Tests/interval.sql sql/test/pg_regress/Tests/interval.stable.err sql/test/pg_regress/Tests/interval.stable.out sql/test/pg_regress/Tests/join.sql sql/test/pg_regress/Tests/join.stable.err sql/test/pg_regress/Tests/join.stable.out sql/test/pg_regress/Tests/limit.sql sql/test/pg_regress/Tests/limit.stable.err sql/test/pg_regress/Tests/limit.stable.out sql/test/pg_regress/Tests/lseg.sql sql/test/pg_regress/Tests/lseg.stable.err sql/test/pg_regress/Tests/lseg.stable.out sql/test/pg_regress/Tests/mule_internal.sql sql/test/pg_regress/Tests/mule_internal.stable.err sql/test/pg_regress/Tests/mule_internal.stable.out sql/test/pg_regress/Tests/name.sql sql/test/pg_regress/Tests/name.stable.err sql/test/pg_regress/Tests/name.stable.out sql/test/pg_regress/Tests/namespace.sql sql/test/pg_regress/Tests/namespace.stable.err sql/test/pg_regress/Tests/namespace.stable.out sql/test/pg_regress/Tests/numeric.sql sql/test/pg_regress/Tests/numeric.stable.err sql/test/pg_regress/Tests/numeric.stable.out sql/test/pg_regress/Tests/numeric_big.sql sql/test/pg_regress/Tests/numeric_big.stable.err sql/test/pg_regress/Tests/numeric_big.stable.out sql/test/pg_regress/Tests/numerology.sql sql/test/pg_regress/Tests/numerology.stable.err sql/test/pg_regress/Tests/numerology.stable.out sql/test/pg_regress/Tests/oid.sql sql/test/pg_regress/Tests/oid.stable.err sql/test/pg_regress/Tests/oid.stable.out sql/test/pg_regress/Tests/oidjoins.sql sql/test/pg_regress/Tests/oidjoins.stable.err sql/test/pg_regress/Tests/oidjoins.stable.out sql/test/pg_regress/Tests/opr_sanity.sql sql/test/pg_regress/Tests/opr_sanity.stable.err sql/test/pg_regress/Tests/opr_sanity.stable.out sql/test/pg_regress/Tests/path.sql sql/test/pg_regress/Tests/path.stable.err sql/test/pg_regress/Tests/path.stable.out sql/test/pg_regress/Tests/plpgsql.sql sql/test/pg_regress/Tests/plpgsql.stable.err sql/test/pg_regress/Tests/plpgsql.stable.out sql/test/pg_regress/Tests/point.sql sql/test/pg_regress/Tests/point.stable.err sql/test/pg_regress/Tests/point.stable.out sql/test/pg_regress/Tests/polygon.sql sql/test/pg_regress/Tests/polygon.stable.err sql/test/pg_regress/Tests/polygon.stable.out sql/test/pg_regress/Tests/polymorphism.sql sql/test/pg_regress/Tests/polymorphism.stable.err sql/test/pg_regress/Tests/polymorphism.stable.out sql/test/pg_regress/Tests/portals.sql sql/test/pg_regress/Tests/portals.stable.err sql/test/pg_regress/Tests/portals.stable.out sql/test/pg_regress/Tests/portals_p2.sql sql/test/pg_regress/Tests/portals_p2.stable.err sql/test/pg_regress/Tests/portals_p2.stable.out sql/test/pg_regress/Tests/prepare.sql sql/test/pg_regress/Tests/prepare.stable.err sql/test/pg_regress/Tests/prepare.stable.out sql/test/pg_regress/Tests/privileges.sql sql/test/pg_regress/Tests/privileges.stable.err sql/test/pg_regress/Tests/privileges.stable.out sql/test/pg_regress/Tests/random.sql sql/test/pg_regress/Tests/random.stable.err sql/test/pg_regress/Tests/random.stable.out sql/test/pg_regress/Tests/rangefuncs.sql sql/test/pg_regress/Tests/rangefuncs.stable.err sql/test/pg_regress/Tests/rangefuncs.stable.out sql/test/pg_regress/Tests/reltime.sql sql/test/pg_regress/Tests/reltime.stable.err sql/test/pg_regress/Tests/reltime.stable.out sql/test/pg_regress/Tests/rowtypes.sql sql/test/pg_regress/Tests/rowtypes.stable.err sql/test/pg_regress/Tests/rowtypes.stable.out sql/test/pg_regress/Tests/rules.sql sql/test/pg_regress/Tests/rules.stable.err sql/test/pg_regress/Tests/rules.stable.out sql/test/pg_regress/Tests/sanity_check.sql sql/test/pg_regress/Tests/sanity_check.stable.err sql/test/pg_regress/Tests/sanity_check.stable.out sql/test/pg_regress/Tests/select.sql sql/test/pg_regress/Tests/select.stable.err sql/test/pg_regress/Tests/select.stable.out sql/test/pg_regress/Tests/select_distinct.sql sql/test/pg_regress/Tests/select_distinct.stable.err sql/test/pg_regress/Tests/select_distinct.stable.out sql/test/pg_regress/Tests/select_distinct_on.sql sql/test/pg_regress/Tests/select_distinct_on.stable.err sql/test/pg_regress/Tests/select_distinct_on.stable.out sql/test/pg_regress/Tests/select_having.sql sql/test/pg_regress/Tests/select_having.stable.err sql/test/pg_regress/Tests/select_having.stable.out sql/test/pg_regress/Tests/select_implicit.sql sql/test/pg_regress/Tests/select_implicit.stable.err sql/test/pg_regress/Tests/select_implicit.stable.out sql/test/pg_regress/Tests/select_into.sql sql/test/pg_regress/Tests/select_into.stable.err sql/test/pg_regress/Tests/select_into.stable.out sql/test/pg_regress/Tests/select_views.sql sql/test/pg_regress/Tests/select_views.stable.err sql/test/pg_regress/Tests/select_views.stable.out sql/test/pg_regress/Tests/sequence.sql sql/test/pg_regress/Tests/sequence.stable.err sql/test/pg_regress/Tests/sequence.stable.out sql/test/pg_regress/Tests/sql_ascii.sql sql/test/pg_regress/Tests/sql_ascii.stable.err sql/test/pg_regress/Tests/sql_ascii.stable.out sql/test/pg_regress/Tests/stats.sql sql/test/pg_regress/Tests/stats.stable.err sql/test/pg_regress/Tests/stats.stable.out sql/test/pg_regress/Tests/strings.sql sql/test/pg_regress/Tests/strings.stable.err sql/test/pg_regress/Tests/strings.stable.out sql/test/pg_regress/Tests/strings_cast.sql sql/test/pg_regress/Tests/strings_concat.sql sql/test/pg_regress/Tests/strings_like.sql sql/test/pg_regress/Tests/subselect.sql sql/test/pg_regress/Tests/subselect.stable.err sql/test/pg_regress/Tests/subselect.stable.out sql/test/pg_regress/Tests/temp.sql sql/test/pg_regress/Tests/temp.stable.err sql/test/pg_regress/Tests/temp.stable.out sql/test/pg_regress/Tests/text.sql sql/test/pg_regress/Tests/time.sql sql/test/pg_regress/Tests/time.stable.err sql/test/pg_regress/Tests/time.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.sql sql/test/pg_regress/Tests/timetz.stable.err sql/test/pg_regress/Tests/timetz.stable.out sql/test/pg_regress/Tests/tinterval.sql sql/test/pg_regress/Tests/tinterval.stable.err sql/test/pg_regress/Tests/tinterval.stable.out sql/test/pg_regress/Tests/transactions.sql sql/test/pg_regress/Tests/transactions.stable.err sql/test/pg_regress/Tests/transactions.stable.out sql/test/pg_regress/Tests/triggers.sql sql/test/pg_regress/Tests/triggers.stable.err sql/test/pg_regress/Tests/triggers.stable.out sql/test/pg_regress/Tests/truncate.sql sql/test/pg_regress/Tests/truncate.stable.err sql/test/pg_regress/Tests/truncate.stable.out sql/test/pg_regress/Tests/type_sanity.sql sql/test/pg_regress/Tests/type_sanity.stable.err sql/test/pg_regress/Tests/type_sanity.stable.out sql/test/pg_regress/Tests/union.sql sql/test/pg_regress/Tests/union.stable.err sql/test/pg_regress/Tests/union.stable.out sql/test/pg_regress/Tests/update.sql sql/test/pg_regress/Tests/update.stable.err sql/test/pg_regress/Tests/update.stable.out sql/test/pg_regress/Tests/vacuum.sql sql/test/pg_regress/Tests/vacuum.stable.err sql/test/pg_regress/Tests/vacuum.stable.out sql/test/pg_regress/Tests/varchar.sql 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 Removed Files: sql/test/pg_regress/Tests/char.SQL.bat sql/test/pg_regress/Tests/char.SQL.sh sql/test/pg_regress/Tests/strings_cast.SQL.bat sql/test/pg_regress/Tests/strings_cast.SQL.sh sql/test/pg_regress/Tests/strings_concat.SQL.bat sql/test/pg_regress/Tests/strings_concat.SQL.sh sql/test/pg_regress/Tests/strings_like.SQL.bat sql/test/pg_regress/Tests/strings_like.SQL.sh sql/test/pg_regress/Tests/text.SQL.bat sql/test/pg_regress/Tests/text.SQL.sh sql/test/pg_regress/Tests/varchar.SQL.bat sql/test/pg_regress/Tests/varchar.SQL.sh sql/test/pg_regress/monetdb/abstime.sql sql/test/pg_regress/monetdb/aggregates.sql sql/test/pg_regress/monetdb/alter_table.sql sql/test/pg_regress/monetdb/arrays.sql sql/test/pg_regress/monetdb/bit.sql sql/test/pg_regress/monetdb/boolean.sql sql/test/pg_regress/monetdb/box.sql sql/test/pg_regress/monetdb/btree_index.sql sql/test/pg_regress/monetdb/case.sql sql/test/pg_regress/monetdb/char.sql sql/test/pg_regress/monetdb/circle.sql sql/test/pg_regress/monetdb/cluster.sql sql/test/pg_regress/monetdb/comments.sql sql/test/pg_regress/monetdb/conversion.sql sql/test/pg_regress/monetdb/copy2.sql sql/test/pg_regress/monetdb/create_aggregate.sql sql/test/pg_regress/monetdb/create_index.sql sql/test/pg_regress/monetdb/create_misc.sql sql/test/pg_regress/monetdb/create_operator.sql sql/test/pg_regress/monetdb/create_table.sql sql/test/pg_regress/monetdb/create_type.sql sql/test/pg_regress/monetdb/create_view.sql sql/test/pg_regress/monetdb/date.sql sql/test/pg_regress/monetdb/domain.sql sql/test/pg_regress/monetdb/drop.sql sql/test/pg_regress/monetdb/errors.sql sql/test/pg_regress/monetdb/float4.sql sql/test/pg_regress/monetdb/float8.sql sql/test/pg_regress/monetdb/foreign_key.sql sql/test/pg_regress/monetdb/geometry.sql sql/test/pg_regress/monetdb/hash_index.sql sql/test/pg_regress/monetdb/horology.sql sql/test/pg_regress/monetdb/inet.sql sql/test/pg_regress/monetdb/inherit.sql sql/test/pg_regress/monetdb/insert.sql sql/test/pg_regress/monetdb/int2.sql sql/test/pg_regress/monetdb/int4.sql sql/test/pg_regress/monetdb/int8.sql sql/test/pg_regress/monetdb/interval.sql sql/test/pg_regress/monetdb/join.sql sql/test/pg_regress/monetdb/limit.sql sql/test/pg_regress/monetdb/lseg.sql sql/test/pg_regress/monetdb/mule_internal.sql sql/test/pg_regress/monetdb/name.sql sql/test/pg_regress/monetdb/namespace.sql sql/test/pg_regress/monetdb/numeric.sql sql/test/pg_regress/monetdb/numeric_big.sql sql/test/pg_regress/monetdb/numerology.sql sql/test/pg_regress/monetdb/oid.sql sql/test/pg_regress/monetdb/oidjoins.sql sql/test/pg_regress/monetdb/opr_sanity.sql sql/test/pg_regress/monetdb/path.sql sql/test/pg_regress/monetdb/plpgsql.sql sql/test/pg_regress/monetdb/point.sql sql/test/pg_regress/monetdb/polygon.sql sql/test/pg_regress/monetdb/polymorphism.sql sql/test/pg_regress/monetdb/portals.sql sql/test/pg_regress/monetdb/portals_p2.sql sql/test/pg_regress/monetdb/prepare.sql sql/test/pg_regress/monetdb/privileges.sql sql/test/pg_regress/monetdb/random.sql sql/test/pg_regress/monetdb/rangefuncs.sql sql/test/pg_regress/monetdb/reltime.sql sql/test/pg_regress/monetdb/rowtypes.sql sql/test/pg_regress/monetdb/rules.sql sql/test/pg_regress/monetdb/sanity_check.sql sql/test/pg_regress/monetdb/select.sql sql/test/pg_regress/monetdb/select_distinct.sql sql/test/pg_regress/monetdb/select_distinct_on.sql sql/test/pg_regress/monetdb/select_having.sql sql/test/pg_regress/monetdb/select_implicit.sql sql/test/pg_regress/monetdb/select_into.sql sql/test/pg_regress/monetdb/select_views.sql sql/test/pg_regress/monetdb/sequence.sql sql/test/pg_regress/monetdb/sql_ascii.sql sql/test/pg_regress/monetdb/stats.sql sql/test/pg_regress/monetdb/strings.sql sql/test/pg_regress/monetdb/strings_cast.sql sql/test/pg_regress/monetdb/strings_concat.sql sql/test/pg_regress/monetdb/strings_like.sql sql/test/pg_regress/monetdb/subselect.sql sql/test/pg_regress/monetdb/temp.sql sql/test/pg_regress/monetdb/text.sql sql/test/pg_regress/monetdb/time.sql sql/test/pg_regress/monetdb/timestamp.sql sql/test/pg_regress/monetdb/timestamptz.sql sql/test/pg_regress/monetdb/timetz.sql sql/test/pg_regress/monetdb/tinterval.sql sql/test/pg_regress/monetdb/transactions.sql sql/test/pg_regress/monetdb/triggers.sql sql/test/pg_regress/monetdb/truncate.sql sql/test/pg_regress/monetdb/type_sanity.sql sql/test/pg_regress/monetdb/union.sql sql/test/pg_regress/monetdb/update.sql sql/test/pg_regress/monetdb/vacuum.sql sql/test/pg_regress/monetdb/varchar.sql sql/test/pg_regress/monetdb/without_oid.sql 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 bootstrap clients/R/MonetDB.R/src/mapi.c clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures_gsl.stable.out clients/Tests/MAL-signatures_nocfitsio.stable.out clients/Tests/MAL-signatures_sphinxclient.stable.out clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.64bit.oid32 clients/Tests/SQL-dump_gsl.stable.out clients/Tests/SQL-dump_gsl.stable.out.oid32 clients/Tests/SQL-dump_nogeom.stable.out clients/Tests/exports.stable.out clients/mapiclient/ReadlineTools.c clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/mapiclient/tomograph.c clients/mapilib/mapi.rc clients/odbc/driver/ODBCUtil.c clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driver/SQLGetInfo.c clients/odbc/driver/SQLPrepare.c clients/odbc/driver/SQLPrimaryKeys.c clients/odbc/driver/SQLProcedures.c clients/odbc/driver/SQLSpecialColumns.c clients/odbc/driver/SQLStatistics.c clients/odbc/driver/SQLTablePrivileges.c clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python2/test/capabilities.py clients/python3/setup.py clients/python3/test/capabilities.py common/stream/stream.c configure.ag debian/changelog debian/control gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/libbat.rc geom/monetdb5/geom.c java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java libversions monetdb5/mal/mal_atom.c monetdb5/mal/mal_builder.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_import.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/json.mal monetdb5/modules/atoms/xml.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/bat5.mal monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/batExtensions.h monetdb5/modules/mal/batExtensions.mal monetdb5/modules/mal/calc.mal.sh monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tokenizer.c monetdb5/optimizer/Tests/inline08.stable.out monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_evaluate.c monetdb5/optimizer/opt_octopus.c monetdb5/optimizer/opt_qep.c monetdb5/optimizer/opt_remoteQueries.c monetdb5/optimizer/opt_reorder.c monetdb5/optimizer/opt_strengthReduction.c monetdb5/optimizer/opt_wrapper.c monetdb5/scheduler/run_octopus.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/LSST/lsst.c sql/backends/monet5/Makefile.ag sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_result.c sql/backends/monet5/vaults/fits.c sql/jdbc/tests/Tests/Test_PSmetadata.stable.out sql/scripts/40_json.sql sql/server/rel_dump.c sql/server/rel_select.c sql/server/rel_select.h sql/server/rel_updates.c sql/server/sql_parser.y sql/test/ADT2006/Tests/bram.stable.out sql/test/BugTracker-2012/Tests/create_function.Bug-3172.stable.err sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions_gsl.stable.out sql/test/Tests/systemfunctions_nogeom.stable.out sql/test/json/Tests/All sql/test/json/Tests/aggregate00.sql sql/test/json/Tests/aggregate00.stable.out sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check5.stable.out sql/test/pg_regress/Tests/All sql/test/pg_regress/Tests/char.stable.err sql/test/pg_regress/Tests/char.stable.out sql/test/pg_regress/Tests/load.SQL.bat sql/test/pg_regress/Tests/load.SQL.sh 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/strings_concat.stable.out sql/test/pg_regress/Tests/strings_like.stable.err sql/test/pg_regress/Tests/strings_like.stable.out sql/test/pg_regress/Tests/text.stable.err sql/test/pg_regress/Tests/text.stable.out sql/test/pg_regress/Tests/varchar.stable.err sql/test/pg_regress/Tests/varchar.stable.out testing/Mtest.py.in tools/merovingian/daemon/argvcmds.c tools/merovingian/daemon/client.c tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/proxy.c tools/merovingian/utils/control.c tools/merovingian/utils/database.c tools/merovingian/utils/properties.c tools/merovingian/utils/properties.h vertoo.data Branch: bamloader Log Message:
Merge with default branch. diffs (truncated from 48062 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -564,3 +564,6 @@ fa6872e2a8cf8bb3b4fb25a3b356946316f52a6b 242fe4b4960f54c339f7a6fb79aedd8f3b5e217a Jan2014_SP1_release c91c4d792dee1074ce6f489e94ce4bfc480edfb3 Jan2014_15 13e1b24f442791f5ab790fa77453d3bd4e88a9c8 Jan2014_SP2_release +c3051f066a9eea814487dfb0b7cf7070ae16cd21 Jan2014_17 +13e1b24f442791f5ab790fa77453d3bd4e88a9c8 Jan2014_SP2_release +389f5f0d4c43ab689e31c28e01b43c8b7ba8de9c Jan2014_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -839,6 +839,10 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD rm -fr $RPM_BUILD_ROOT %changelog +* Wed May 14 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.17-20140514 +- Rebuilt. +- BZ#3482: Crossproduct error + * Thu May 08 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 - Rebuilt. - BZ#3424: numeric values at the front of strings determines whether diff --git a/bootstrap b/bootstrap --- a/bootstrap +++ b/bootstrap @@ -29,6 +29,17 @@ type -P glibtoolize > /dev/null \ && libtoolize=glibtoolize \ || libtoolize=libtoolize +# cope with systems where aclocal is known as aclocal-1.10 (and +# automake as automake-1.10), e.g. OpenIndiana +amv= +if ! type -P aclocal > /dev/null; then + if type -P aclocal-1.11 > /dev/null; then + amv=-1.11 + elif type -P aclocal-1.10 > /dev/null; then + amv=-1.10 + fi +fi + _m4_extra_dirs= if [[ -n ${M4DIRS} ]] ; then for d in ${M4DIRS} ; do @@ -52,9 +63,9 @@ while read f; do [ -x $f.in ] && echo "A sed '1,/^AC_CONFIG_FILES/d' configure.ag ) > configure.ac && $libtoolize -c -f && -aclocal ${_m4_extra_dirs} && +aclocal$amv ${_m4_extra_dirs} && autoheader && -automake --add-missing --copy --foreign && +automake$amv --add-missing --copy --foreign && autoconf if [ -f buildtools/conf/install-sh -a ! -x buildtools/conf/install-sh ]; then chmod +x buildtools/conf/install-sh diff --git a/clients/R/MonetDB.R/src/mapi.c b/clients/R/MonetDB.R/src/mapi.c --- a/clients/R/MonetDB.R/src/mapi.c +++ b/clients/R/MonetDB.R/src/mapi.c @@ -257,8 +257,8 @@ SEXP mapiRead(SEXP conn) { while (response_buf_offset + block_length > response_buf_len) { response_buf_len += ALLOCSIZE; if (DEBUG) { - printf("II: Reallocating memory, new size %lu\n", - (unsigned long) response_buf_len); + printf("II: Reallocating memory, new size "SZFMT"\n", + response_buf_len); } response_buf = realloc(response_buf, response_buf_len); if (response_buf == NULL) { diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -2691,31 +2691,19 @@ command algebra.slice(b:bat[:any_1,:any_ address ALGslice_oid; comment Return the slice based on head oid x till y (exclusive). -command algebra.select(b:bat[:any_2,:void],low:any_2,high:any_2,li:bit,hi:bit):bat[:any_2,:void] -address ALGselectInclusiveHead; -command algebra.select(b:bat[:any_2,:void],low:any_2,high:any_2):bat[:any_2,:void] -address ALGselectHead; -command algebra.select(b:bat[:any_2,:void],low:any_2):bat[:any_2,:void] -address ALGselect1Head; -command algebra.selectH(b:bat[:any_1,:any_2],value:any_1):bat[:any_1,:any_2] -address ALGselect1Head; -command algebra.selectH(b:bat[:any_1,:any_2],low:any_1,high:any_1,li:bit,hi:bit):bat[:any_1,:any_2] -address ALGselectInclusiveHead; -command algebra.selectH(b:bat[:any_1,:any_2],low:any_1,high:any_1):bat[:any_1,:any_2] -address ALGselectHead; -command algebra.selectNotNil(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] +command algebra.selectNotNil(b:bat[:oid,:any_2]):bat[:oid,:any_2] address ALGselectNotNil; comment Select all not-nil values -command algebra.select(b:bat[:any_1,:any_2],value:any_2):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],value:any_2):bat[:oid,:any_2] address ALGselect1; comment Select all BUNs of a BAT with a certain tail value. Selection on NIL is also possible (it should be properly casted, e.g.:int(nil)). -command algebra.select(b:bat[:any_1,:any_2],low:any_2,high:any_2,li:bit,hi:bit):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2,li:bit,hi:bit):bat[:oid,:any_2] address ALGselectInclusive; comment Select all BUNs that have tail values: {v| low <{=} v <{=} high}. Boundary inclusion is indicated separately. NIL boundary values have a special meaning. + low == nil means: no lower bound + high == nil means: no upper bound. -command algebra.select(b:bat[:any_1,:any_2],low:any_2,high:any_2):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2):bat[:oid,:any_2] address ALGselect; comment Select all BUNs that have tail values: {v| low <= v <= high}. NIL boundary values have a special meaning. + low == nil means: no lower bound + high == nil means: no upper bound. NOTE 1: you should cast the nil to the appropriate type, e.g. int(nil) in order to circumvent type clashes. NOTE 2: as the 'nil' element has no clear place in the ordered domain of values, tuples with 'nil' values are NEVER returned by the range select. @@ -2759,10 +2747,6 @@ command algebra.topN(b:bat[:any_1,:any_2 address ALGtopN; comment Trim all but the top N tuples. -command algebra.thetaselect(b:bat[:any_1,:any_2],val:any_2,op:str):bat[:any_1,:any_2] -address ALGthetaselect; -comment The theta (<=,<,=,>,>=) select() - command algebra.thetasubselect(b:bat[:oid,:any_1],s:bat[:oid,:oid],val:any_1,op:str):bat[:oid,:oid] address ALGthetasubselect2; comment Select all head values of the first input BAT for which the tail value obeys the relation value OP VAL and for which the head value occurs in the tail of the second input BAT. Input is a dense-headed BAT, output is a dense-headed BAT with in the tail the head value of the input BAT for which the relationship holds. The output BAT is sorted on the tail value. @@ -32068,14 +32052,6 @@ command bat.setHash(b:bat[:oid,:any_2],p address BKCsetHash; comment Create a hash structure on the column -command bat.setMemoryAdvise(b:bat[:oid,:any_2],mode:int):bit -address BKCmadvise2; -comment alias for madvise(b, mode, mode, mode, mode) - -command bat.setMemoryAdvise(b:bat[:oid,:any_2],head_mode:int,tail_mode:int,hheap_mode:int,theap_mode:int):bit -address BKCmadvise; -comment Modern Operating Systems allow users to influence the buffer management policy of virtual memory. This is a crucial feature for database systems, and eliminates the need to reimplement the OS in a database buffer manager. The supported flags are BUF_NORMAL (the normal adaptive kernel algorithm), BUF_RANDOM (no page prefetching), BUF_SEQUENTIAL (prefetch and swapout), BUF_WILLNEED (load everything with prefetch), BUF_DONTNEED (swapout). These buffer management modes are not persistent. Returns the BAT operated upon. - command bat.setMemoryMap(b:bat[:oid,:any_2],mode:int):bit address BKCmmap2; comment Alias for mmap(b, mode, mode, mode, mode) @@ -39444,6 +39420,10 @@ command iterator.new(b:bat[:oid,:any_2], address ITRnewChunk; comment Create an iterator with fixed granule size. The result is a view. +command json.aggr(val:bat[:oid,:dbl]):str +address JSONgroupStr; +comment Aggregate the double values to array. + command json.aggr(val:bat[:oid,:str]):str address JSONgroupStr; comment Aggregate the string values to array. @@ -39550,10 +39530,18 @@ pattern json.renderarray(val:any...):jso address JSONrenderarray; pattern json.renderobject(val:any...):json address JSONrenderobject; +command json.subaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] +address JSONsubjsoncand; +comment Grouped aggregation of values with candidates list. + command json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] address JSONsubjsoncand; comment Grouped aggregation of values with candidates list. +command json.subaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] +address JSONsubjson; +comment Grouped aggregation of values. + command json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] address JSONsubjson; comment Grouped aggregation of values. diff --git a/clients/Tests/MAL-signatures_gsl.stable.out b/clients/Tests/MAL-signatures_gsl.stable.out --- a/clients/Tests/MAL-signatures_gsl.stable.out +++ b/clients/Tests/MAL-signatures_gsl.stable.out @@ -2691,31 +2691,19 @@ command algebra.slice(b:bat[:any_1,:any_ address ALGslice_oid; comment Return the slice based on head oid x till y (exclusive). -command algebra.select(b:bat[:any_2,:void],low:any_2,high:any_2,li:bit,hi:bit):bat[:any_2,:void] -address ALGselectInclusiveHead; -command algebra.select(b:bat[:any_2,:void],low:any_2,high:any_2):bat[:any_2,:void] -address ALGselectHead; -command algebra.select(b:bat[:any_2,:void],low:any_2):bat[:any_2,:void] -address ALGselect1Head; -command algebra.selectH(b:bat[:any_1,:any_2],value:any_1):bat[:any_1,:any_2] -address ALGselect1Head; -command algebra.selectH(b:bat[:any_1,:any_2],low:any_1,high:any_1,li:bit,hi:bit):bat[:any_1,:any_2] -address ALGselectInclusiveHead; -command algebra.selectH(b:bat[:any_1,:any_2],low:any_1,high:any_1):bat[:any_1,:any_2] -address ALGselectHead; -command algebra.selectNotNil(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] +command algebra.selectNotNil(b:bat[:oid,:any_2]):bat[:oid,:any_2] address ALGselectNotNil; comment Select all not-nil values -command algebra.select(b:bat[:any_1,:any_2],value:any_2):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],value:any_2):bat[:oid,:any_2] address ALGselect1; comment Select all BUNs of a BAT with a certain tail value. Selection on NIL is also possible (it should be properly casted, e.g.:int(nil)). -command algebra.select(b:bat[:any_1,:any_2],low:any_2,high:any_2,li:bit,hi:bit):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2,li:bit,hi:bit):bat[:oid,:any_2] address ALGselectInclusive; comment Select all BUNs that have tail values: {v| low <{=} v <{=} high}. Boundary inclusion is indicated separately. NIL boundary values have a special meaning. + low == nil means: no lower bound + high == nil means: no upper bound. -command algebra.select(b:bat[:any_1,:any_2],low:any_2,high:any_2):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2):bat[:oid,:any_2] address ALGselect; comment Select all BUNs that have tail values: {v| low <= v <= high}. NIL boundary values have a special meaning. + low == nil means: no lower bound + high == nil means: no upper bound. NOTE 1: you should cast the nil to the appropriate type, e.g. int(nil) in order to circumvent type clashes. NOTE 2: as the 'nil' element has no clear place in the ordered domain of values, tuples with 'nil' values are NEVER returned by the range select. @@ -2759,10 +2747,6 @@ command algebra.topN(b:bat[:any_1,:any_2 address ALGtopN; comment Trim all but the top N tuples. -command algebra.thetaselect(b:bat[:any_1,:any_2],val:any_2,op:str):bat[:any_1,:any_2] -address ALGthetaselect; -comment The theta (<=,<,=,>,>=) select() - command algebra.thetasubselect(b:bat[:oid,:any_1],s:bat[:oid,:oid],val:any_1,op:str):bat[:oid,:oid] address ALGthetasubselect2; comment Select all head values of the first input BAT for which the tail value obeys the relation value OP VAL and for which the head value occurs in the tail of the second input BAT. Input is a dense-headed BAT, output is a dense-headed BAT with in the tail the head value of the input BAT for which the relationship holds. The output BAT is sorted on the tail value. @@ -32080,14 +32064,6 @@ command bat.setHash(b:bat[:oid,:any_2],p address BKCsetHash; comment Create a hash structure on the column -command bat.setMemoryAdvise(b:bat[:oid,:any_2],mode:int):bit -address BKCmadvise2; -comment alias for madvise(b, mode, mode, mode, mode) - -command bat.setMemoryAdvise(b:bat[:oid,:any_2],head_mode:int,tail_mode:int,hheap_mode:int,theap_mode:int):bit -address BKCmadvise; -comment Modern Operating Systems allow users to influence the buffer management policy of virtual memory. This is a crucial feature for database systems, and eliminates the need to reimplement the OS in a database buffer manager. The supported flags are BUF_NORMAL (the normal adaptive kernel algorithm), BUF_RANDOM (no page prefetching), BUF_SEQUENTIAL (prefetch and swapout), BUF_WILLNEED (load everything with prefetch), BUF_DONTNEED (swapout). These buffer management modes are not persistent. Returns the BAT operated upon. - command bat.setMemoryMap(b:bat[:oid,:any_2],mode:int):bit address BKCmmap2; comment Alias for mmap(b, mode, mode, mode, mode) @@ -39460,6 +39436,10 @@ command iterator.new(b:bat[:oid,:any_2], address ITRnewChunk; comment Create an iterator with fixed granule size. The result is a view. +command json.aggr(val:bat[:oid,:dbl]):str +address JSONgroupStr; +comment Aggregate the double values to array. + command json.aggr(val:bat[:oid,:str]):str address JSONgroupStr; comment Aggregate the string values to array. @@ -39566,10 +39546,18 @@ pattern json.renderarray(val:any...):jso address JSONrenderarray; pattern json.renderobject(val:any...):json address JSONrenderobject; +command json.subaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] +address JSONsubjsoncand; +comment Grouped aggregation of values with candidates list. + command json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] address JSONsubjsoncand; comment Grouped aggregation of values with candidates list. +command json.subaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] +address JSONsubjson; +comment Grouped aggregation of values. + command json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] address JSONsubjson; comment Grouped aggregation of values. diff --git a/clients/Tests/MAL-signatures_nocfitsio.stable.out b/clients/Tests/MAL-signatures_nocfitsio.stable.out --- a/clients/Tests/MAL-signatures_nocfitsio.stable.out +++ b/clients/Tests/MAL-signatures_nocfitsio.stable.out @@ -2691,31 +2691,19 @@ command algebra.slice(b:bat[:any_1,:any_ address ALGslice_oid; comment Return the slice based on head oid x till y (exclusive). -command algebra.select(b:bat[:any_2,:void],low:any_2,high:any_2,li:bit,hi:bit):bat[:any_2,:void] -address ALGselectInclusiveHead; -command algebra.select(b:bat[:any_2,:void],low:any_2,high:any_2):bat[:any_2,:void] -address ALGselectHead; -command algebra.select(b:bat[:any_2,:void],low:any_2):bat[:any_2,:void] -address ALGselect1Head; -command algebra.selectH(b:bat[:any_1,:any_2],value:any_1):bat[:any_1,:any_2] -address ALGselect1Head; -command algebra.selectH(b:bat[:any_1,:any_2],low:any_1,high:any_1,li:bit,hi:bit):bat[:any_1,:any_2] -address ALGselectInclusiveHead; -command algebra.selectH(b:bat[:any_1,:any_2],low:any_1,high:any_1):bat[:any_1,:any_2] -address ALGselectHead; -command algebra.selectNotNil(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] +command algebra.selectNotNil(b:bat[:oid,:any_2]):bat[:oid,:any_2] address ALGselectNotNil; comment Select all not-nil values -command algebra.select(b:bat[:any_1,:any_2],value:any_2):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],value:any_2):bat[:oid,:any_2] address ALGselect1; comment Select all BUNs of a BAT with a certain tail value. Selection on NIL is also possible (it should be properly casted, e.g.:int(nil)). -command algebra.select(b:bat[:any_1,:any_2],low:any_2,high:any_2,li:bit,hi:bit):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2,li:bit,hi:bit):bat[:oid,:any_2] address ALGselectInclusive; comment Select all BUNs that have tail values: {v| low <{=} v <{=} high}. Boundary inclusion is indicated separately. NIL boundary values have a special meaning. + low == nil means: no lower bound + high == nil means: no upper bound. -command algebra.select(b:bat[:any_1,:any_2],low:any_2,high:any_2):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2):bat[:oid,:any_2] address ALGselect; comment Select all BUNs that have tail values: {v| low <= v <= high}. NIL boundary values have a special meaning. + low == nil means: no lower bound + high == nil means: no upper bound. NOTE 1: you should cast the nil to the appropriate type, e.g. int(nil) in order to circumvent type clashes. NOTE 2: as the 'nil' element has no clear place in the ordered domain of values, tuples with 'nil' values are NEVER returned by the range select. _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list