Changeset: 65a43c2fa970 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65a43c2fa970 Added Files: sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.sql sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.stable.err sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.stable.out sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.py sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.stable.err sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.stable.out sql/test/BugTracker-2014/Tests/combined_WHERE_conditions.Bug-3642.sql sql/test/BugTracker-2014/Tests/combined_WHERE_conditions.Bug-3642.stable.err sql/test/BugTracker-2014/Tests/combined_WHERE_conditions.Bug-3642.stable.out Removed Files: sql/test/BugTracker-2008/Tests/too_may_nested_operators.SF-2102167.sql sql/test/BugTracker-2008/Tests/too_may_nested_operators.SF-2102167.stable.err sql/test/BugTracker-2008/Tests/too_may_nested_operators.SF-2102167.stable.out Modified Files: NT/monetdb_config.h.in 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/dump.c clients/mapiclient/mclient.c clients/mapiclient/msqldump.h configure.ag gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_calc.c gdk/gdk_select.c gdk/gdk_utils.c monetdb5/ChangeLog monetdb5/mal/Tests/tst1505.mal monetdb5/mal/Tests/tst1505.stable.out monetdb5/mal/Tests/tst1506.mal monetdb5/mal/Tests/tst1506.stable.out monetdb5/mal/Tests/tst909.mal monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/atoms/mtime.mal monetdb5/modules/mal/01_batcalc.mal monetdb5/modules/mal/batcalc.c monetdb5/optimizer/opt_pushselect.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_scenario.c sql/scripts/Makefile.ag sql/server/rel_select.c sql/storage/bat/bat_storage.c sql/test/BugTracker-2008/Tests/All sql/test/BugTracker-2014/Tests/All 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/box.sql sql/test/pg_regress/Tests/box.stable.err sql/test/pg_regress/Tests/box.stable.out sql/test/pg_regress/Tests/case.stable.err sql/test/pg_regress/Tests/char.stable.err 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_operator.stable.err 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/drop.stable.err sql/test/pg_regress/Tests/float4.stable.err sql/test/pg_regress/Tests/float8.stable.err sql/test/pg_regress/Tests/horology.stable.err sql/test/pg_regress/Tests/horology.stable.out sql/test/pg_regress/Tests/inet.stable.err sql/test/pg_regress/Tests/insert.stable.err sql/test/pg_regress/Tests/int2.stable.err sql/test/pg_regress/Tests/int4.stable.err sql/test/pg_regress/Tests/int8.stable.err 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/limit.stable.err sql/test/pg_regress/Tests/numeric.stable.err 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/point.sql sql/test/pg_regress/Tests/point.stable.err sql/test/pg_regress/Tests/point.stable.out sql/test/pg_regress/Tests/reltime.stable.err 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_cast.stable.err sql/test/pg_regress/Tests/strings_concat.stable.err 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/varchar.stable.err sql/test/pg_regress/Tests/without_oid.stable.err sql/test/pg_regress/postgresql2sql99.sh testing/Mtest.py.in testing/process.py Branch: resultset Log Message:
merge with default diffs (truncated from 17419 to 300 lines): 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 @@ -993,6 +993,14 @@ #endif #endif +/* Define to `__restrict__' or `__restrict' if that's what the C compiler + calls it, or to nothing if 'restrict' is not supported under any name. */ +#ifndef __cplusplus +#ifndef restrict +#define restrict __restrict +#endif +#endif + /* Define to `long int' if <sys/types.h> does not define. */ /* #undef off_t */ diff --git a/clients/Tests/MAL-signatures_all.stable.out b/clients/Tests/MAL-signatures_all.stable.out --- a/clients/Tests/MAL-signatures_all.stable.out +++ b/clients/Tests/MAL-signatures_all.stable.out @@ -24804,10 +24804,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],b1:bat[:oid,:any_1]):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.ifthenelse(b:bat[:oid,:bit],v1:any_1,b2:bat[:oid,:any_1]):bat[:oid,:any_1] address CMDifthen; comment If-then-else operation to assemble a conditional result @@ -24820,10 +24816,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],v1:any_1):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.int_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:int] address CMDconvert_int; comment cast from str to int with candidates list @@ -40414,6 +40406,10 @@ command mtime.date(X_1:date):date address MTIMEdate2date; comment generate the nil date +command mtime.date_sub_month_interval(t:date,s:int):date +address MTIMEdate_submonths; +comment Subtract months from a date + command mtime.date_add_month_interval(t:date,s:int):date address MTIMEdate_addmonths; comment Add months to a date diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128 b/clients/Tests/MAL-signatures_all.stable.out.int128 --- a/clients/Tests/MAL-signatures_all.stable.out.int128 +++ b/clients/Tests/MAL-signatures_all.stable.out.int128 @@ -32049,10 +32049,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],b1:bat[:oid,:any_1]):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.ifthenelse(b:bat[:oid,:bit],v1:any_1,b2:bat[:oid,:any_1]):bat[:oid,:any_1] address CMDifthen; comment If-then-else operation to assemble a conditional result @@ -32065,10 +32061,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],v1:any_1):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.int_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:int] address CMDconvert_int; comment cast from str to int with candidates list diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out b/clients/Tests/MAL-signatures_fits_geom.stable.out --- a/clients/Tests/MAL-signatures_fits_geom.stable.out +++ b/clients/Tests/MAL-signatures_fits_geom.stable.out @@ -24725,10 +24725,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],b1:bat[:oid,:any_1]):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.ifthenelse(b:bat[:oid,:bit],v1:any_1,b2:bat[:oid,:any_1]):bat[:oid,:any_1] address CMDifthen; comment If-then-else operation to assemble a conditional result @@ -24741,10 +24737,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],v1:any_1):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.int_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:int] address CMDconvert_int; comment cast from str to int with candidates list @@ -40331,6 +40323,10 @@ command mtime.date(X_1:date):date address MTIMEdate2date; comment generate the nil date +command mtime.date_sub_month_interval(t:date,s:int):date +address MTIMEdate_submonths; +comment Subtract months from a date + command mtime.date_add_month_interval(t:date,s:int):date address MTIMEdate_addmonths; comment Add months to a date diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 --- a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 +++ b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 @@ -31975,10 +31975,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],b1:bat[:oid,:any_1]):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.ifthenelse(b:bat[:oid,:bit],v1:any_1,b2:bat[:oid,:any_1]):bat[:oid,:any_1] address CMDifthen; comment If-then-else operation to assemble a conditional result @@ -31991,10 +31987,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],v1:any_1):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.int_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:int] address CMDconvert_int; comment cast from str to int with candidates list diff --git a/clients/Tests/MAL-signatures_geom.stable.out b/clients/Tests/MAL-signatures_geom.stable.out --- a/clients/Tests/MAL-signatures_geom.stable.out +++ b/clients/Tests/MAL-signatures_geom.stable.out @@ -24725,10 +24725,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],b1:bat[:oid,:any_1]):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.ifthenelse(b:bat[:oid,:bit],v1:any_1,b2:bat[:oid,:any_1]):bat[:oid,:any_1] address CMDifthen; comment If-then-else operation to assemble a conditional result @@ -24741,10 +24737,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],v1:any_1):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.int_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:int] address CMDconvert_int; comment cast from str to int with candidates list @@ -40307,6 +40299,10 @@ command mtime.date(X_1:date):date address MTIMEdate2date; comment generate the nil date +command mtime.date_sub_month_interval(t:date,s:int):date +address MTIMEdate_submonths; +comment Subtract months from a date + command mtime.date_add_month_interval(t:date,s:int):date address MTIMEdate_addmonths; comment Add months to a date diff --git a/clients/Tests/MAL-signatures_geom.stable.out.int128 b/clients/Tests/MAL-signatures_geom.stable.out.int128 --- a/clients/Tests/MAL-signatures_geom.stable.out.int128 +++ b/clients/Tests/MAL-signatures_geom.stable.out.int128 @@ -31975,10 +31975,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],b1:bat[:oid,:any_1]):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.ifthenelse(b:bat[:oid,:bit],v1:any_1,b2:bat[:oid,:any_1]):bat[:oid,:any_1] address CMDifthen; comment If-then-else operation to assemble a conditional result @@ -31991,10 +31987,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],v1:any_1):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.int_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:int] address CMDconvert_int; comment cast from str to int with candidates list diff --git a/clients/Tests/MAL-signatures_none.stable.out b/clients/Tests/MAL-signatures_none.stable.out --- a/clients/Tests/MAL-signatures_none.stable.out +++ b/clients/Tests/MAL-signatures_none.stable.out @@ -24720,10 +24720,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],b1:bat[:oid,:any_1]):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.ifthenelse(b:bat[:oid,:bit],v1:any_1,b2:bat[:oid,:any_1]):bat[:oid,:any_1] address CMDifthen; comment If-then-else operation to assemble a conditional result @@ -24736,10 +24732,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],v1:any_1):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.int_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:int] address CMDconvert_int; comment cast from str to int with candidates list @@ -40120,6 +40112,10 @@ command mtime.date(X_1:date):date address MTIMEdate2date; comment generate the nil date +command mtime.date_sub_month_interval(t:date,s:int):date +address MTIMEdate_submonths; +comment Subtract months from a date + command mtime.date_add_month_interval(t:date,s:int):date address MTIMEdate_addmonths; comment Add months to a date diff --git a/clients/Tests/MAL-signatures_none.stable.out.int128 b/clients/Tests/MAL-signatures_none.stable.out.int128 --- a/clients/Tests/MAL-signatures_none.stable.out.int128 +++ b/clients/Tests/MAL-signatures_none.stable.out.int128 @@ -31969,10 +31969,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],b1:bat[:oid,:any_1]):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.ifthenelse(b:bat[:oid,:bit],v1:any_1,b2:bat[:oid,:any_1]):bat[:oid,:any_1] address CMDifthen; comment If-then-else operation to assemble a conditional result @@ -31985,10 +31981,6 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthen(b:bat[:oid,:bit],v1:any_1):bat[:oid,:any_1] -address CMDifthen; -comment If-then operation to assemble a conditional result - pattern batcalc.int_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:int] address CMDconvert_int; comment cast from str to int with candidates list diff --git a/clients/Tests/SQL-dump_all.stable.out b/clients/Tests/SQL-dump_all.stable.out --- a/clients/Tests/SQL-dump_all.stable.out +++ b/clients/Tests/SQL-dump_all.stable.out @@ -50,17 +50,14 @@ Ready. # loading sql script: 80_udf.sql # loading sql script: 99_system.sql -# 15:01:36 > -# 15:01:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-13451" "--port=34237" -# 15:01:36 > +# 15:19:38 > +# 15:19:38 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-517" "--port=32251" +# 15:19:38 > -SCHEMA bam -SCHEMA json -SCHEMA tmp -SCHEMA bam -SCHEMA json -SCHEMA tmp +SYSTEM SCHEMA bam +SYSTEM SCHEMA json SYSTEM SCHEMA sys +SYSTEM SCHEMA tmp SYSTEM TABLE sys._columns SYSTEM TABLE sys._tables SYSTEM TABLE sys.args diff --git a/clients/Tests/SQL-dump_all.stable.out.int128 b/clients/Tests/SQL-dump_all.stable.out.int128 --- a/clients/Tests/SQL-dump_all.stable.out.int128 +++ b/clients/Tests/SQL-dump_all.stable.out.int128 @@ -50,12 +50,10 @@ Ready. # 15:16:56 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-9622" "--port=32080" # 15:16:56 > -SCHEMA bam -SCHEMA json -SCHEMA tmp -SCHEMA bam _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
