Changeset: f8aac7335f6f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8aac7335f6f Modified Files: sql/test/pg_regress/Tests/aggregates.stable.err sql/test/pg_regress/Tests/aggregates.stable.out sql/test/pg_regress/Tests/boolean.stable.err sql/test/pg_regress/Tests/boolean.stable.out Branch: default Log Message:
merge diffs (truncated from 331 to 300 lines): diff --git a/sql/test/pg_regress/Tests/aggregates.stable.err b/sql/test/pg_regress/Tests/aggregates.stable.err --- a/sql/test/pg_regress/Tests/aggregates.stable.err +++ b/sql/test/pg_regress/Tests/aggregates.stable.err @@ -68,6 +68,8 @@ ERROR = !SELECT: no such table 'student' MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 QUERY = SELECT count(four) AS cnt_1000 FROM onek; ERROR = !SELECT: no such table 'onek' +QUERY = SELECT count(four) AS cnt_1000 FROM onek; +ERROR = !SELECT: no such table 'onek' MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 QUERY = SELECT count(DISTINCT four) AS cnt_4 FROM onek; ERROR = !SELECT: no such table 'onek' diff --git a/sql/test/pg_regress/Tests/aggregates.stable.out b/sql/test/pg_regress/Tests/aggregates.stable.out --- a/sql/test/pg_regress/Tests/aggregates.stable.out +++ b/sql/test/pg_regress/Tests/aggregates.stable.out @@ -13,8 +13,8 @@ stdout of test 'aggregates` in directory # Copyright (c) 1993-July 2008 CWI. # Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved # Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://uwakai.da.cwi.nl:38959/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1142/.s.monetdb.38959 +# Listening for connection requests on mapi:monetdb://uwakai.da.cwi.nl:34443/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-939/.s.monetdb.34443 # MonetDB/GIS module loaded # MonetDB/SQL module loaded @@ -48,9 +48,9 @@ Ready. # loading sql script: 90_generator.sql # loading sql script: 99_system.sql -# 17:09:48 > -# 17:09:48 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1142" "--port=38959" -# 17:09:48 > +# 17:03:54 > +# 17:03:54 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-939" "--port=34443" +# 17:03:54 > #CREATE TEMPORARY TABLE bool_test( # b1 BOOL, @@ -58,7 +58,7 @@ Ready. # b3 BOOL, # b4 BOOL); -# 17:09:49 > -# 17:09:49 > "Done." -# 17:09:49 > +# 17:03:54 > +# 17:03:54 > "Done." +# 17:03:54 > diff --git a/sql/test/pg_regress/Tests/boolean.stable.err b/sql/test/pg_regress/Tests/boolean.stable.err --- a/sql/test/pg_regress/Tests/boolean.stable.err +++ b/sql/test/pg_regress/Tests/boolean.stable.err @@ -1,9 +1,9 @@ stderr of test 'boolean` in directory 'sql/test/pg_regress` itself: -# 17:09:53 > -# 17:09:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38959" "--set" "mapi_usock=/var/tmp/mtest-1142/.s.monetdb.38959" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress" "--set" "mal_listing=0" -# 17:09:53 > +# 16:51:47 > +# 16:51:47 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30210" "--set" "mapi_usock=/var/tmp/mtest-399/.s.monetdb.30210" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress" "--set" "mal_listing=0" +# 16:51:47 > # builtin opt gdk_dbpath = /ufs/dinther/INSTALL/var/monetdb5/dbfarm/demo # builtin opt gdk_debug = 0 @@ -17,143 +17,143 @@ stderr of test 'boolean` in directory 's # builtin opt sql_debug = 0 # cmdline opt gdk_nr_threads = 0 # cmdline opt mapi_open = true -# cmdline opt mapi_port = 38959 -# cmdline opt mapi_usock = /var/tmp/mtest-1142/.s.monetdb.38959 +# cmdline opt mapi_port = 30210 +# cmdline opt mapi_usock = /var/tmp/mtest-399/.s.monetdb.30210 # cmdline opt monet_prompt = # cmdline opt mal_listing = 2 # cmdline opt gdk_dbpath = /ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress # cmdline opt mal_listing = 0 # cmdline opt gdk_debug = 536870922 -# 17:09:53 > -# 17:09:53 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1142" "--port=38959" -# 17:09:53 > +# 16:51:48 > +# 16:51:48 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-399" "--port=30210" +# 16:51:48 > -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT bool 'f' AS false; ERROR = !incorrect boolean f in: "select bool 'f' as" !syntax error, unexpected BOOL_FALSE in: "false" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT bool 't' or bool 'f' AS true; ERROR = !incorrect boolean t in: "select bool 't' or" !syntax error, unexpected ALIAS in: "bool" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT bool 't' and bool 'f' AS false; ERROR = !incorrect boolean t in: "select bool 't' and" !syntax error, unexpected ALIAS in: "bool" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT not bool 'f' AS true; ERROR = !incorrect boolean f in: "select not bool 'f' as" !syntax error, unexpected BOOL_TRUE in: "true" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT bool 't' = bool 'f' AS false; ERROR = !incorrect boolean t in: "select bool 't' =" !syntax error, unexpected ALIAS in: "bool" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT bool 't' <> bool 'f' AS true; ERROR = !incorrect boolean t in: "select bool 't' <>" !syntax error, unexpected ALIAS in: "bool" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = INSERT INTO BOOLTBL1 (f1) VALUES (bool 't'); ERROR = !incorrect boolean t in: "insert into booltbl1 (f1) values (bool 't')" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = INSERT INTO BOOLTBL1 (f1) VALUES (bool 'True'); ERROR = !incorrect boolean True in: "insert into booltbl1 (f1) values (bool 'True')" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT '' AS t_3, BOOLTBL1.*; ERROR = !Column expression Table 'booltbl1' unknown -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT '' AS zero, BOOLTBL1.* FROM BOOLTBL1 WHERE booleq(bool 'false', f1); ERROR = !SELECT: no such binary operator 'booleq(boolean,boolean)' -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = INSERT INTO BOOLTBL1 (f1) VALUES (bool 'f'); ERROR = !incorrect boolean f in: "insert into booltbl1 (f1) values (bool 'f')" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = INSERT INTO BOOLTBL2 (f1) VALUES (bool 'f'); ERROR = !incorrect boolean f in: "insert into booltbl2 (f1) values (bool 'f')" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = INSERT INTO BOOLTBL2 (f1) VALUES (bool 'False'); ERROR = !incorrect boolean False in: "insert into booltbl2 (f1) values (bool 'False')" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = INSERT INTO BOOLTBL2 (f1) VALUES (bool 'FALSE'); ERROR = !incorrect boolean FALSE in: "insert into booltbl2 (f1) values (bool 'FALSE')" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = INSERT INTO BOOLTBL2 (f1) VALUES (bool 'XXX'); ERROR = !incorrect boolean XXX in: "insert into booltbl2 (f1) ! values (bool 'XXX')" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT '' AS f_4, BOOLTBL2.*; ERROR = !Column expression Table 'booltbl2' unknown -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT '' AS tf_12, BOOLTBL1.*, BOOLTBL2.* WHERE BOOLTBL2.f1 <> BOOLTBL1.f1; ERROR = !SELECT: no such column 'booltbl2.f1' -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT '' AS tf_12, BOOLTBL1.*, BOOLTBL2.* WHERE boolne(BOOLTBL2.f1,BOOLTBL1.f1); ERROR = !SELECT: no such column 'booltbl2.f1' -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT '' AS ff_4, BOOLTBL1.*, BOOLTBL2.* WHERE BOOLTBL2.f1 = BOOLTBL1.f1 and BOOLTBL1.f1 = bool 'false'; ERROR = !SELECT: no such column 'booltbl2.f1' -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT '' AS tf_12_ff_4, BOOLTBL1.*, BOOLTBL2.* WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = bool 'true' ORDER BY BOOLTBL1.f1, BOOLTBL2.f1; ERROR = !relational query without result -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT '' AS "True", f1 FROM BOOLTBL1 WHERE f1 IS TRUE; ERROR = !syntax error, unexpected BOOL_TRUE, expecting sqlNULL or NOT in: "select '' as "True", f1 ! from booltbl1 ! where f1 is true" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT '' AS "Not False", f1 FROM BOOLTBL1 WHERE f1 IS NOT FALSE; ERROR = !syntax error, unexpected BOOL_FALSE, expecting sqlNULL in: "select '' as "Not False", f1 ! from booltbl1 ! where f1 is not false" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT '' AS "False", f1 FROM BOOLTBL1 WHERE f1 IS FALSE; ERROR = !syntax error, unexpected BOOL_FALSE, expecting sqlNULL or NOT in: "select '' as "False", f1 ! from booltbl1 ! where f1 is false" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT '' AS "Not True", f1 FROM BOOLTBL1 WHERE f1 IS NOT TRUE; ERROR = !syntax error, unexpected BOOL_TRUE, expecting sqlNULL in: "select '' as "Not True", f1 ! from booltbl1 ! where f1 is not true" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT '' AS "True", f1 FROM BOOLTBL2 WHERE f1 IS TRUE; ERROR = !syntax error, unexpected BOOL_TRUE, expecting sqlNULL or NOT in: "select '' as "True", f1 ! from booltbl2 ! where f1 is true" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT '' AS "Not False", f1 FROM BOOLTBL2 WHERE f1 IS NOT FALSE; ERROR = !syntax error, unexpected BOOL_FALSE, expecting sqlNULL in: "select '' as "Not False", f1 ! from booltbl2 ! where f1 is not false" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT '' AS "False", f1 FROM BOOLTBL2 WHERE f1 IS FALSE; ERROR = !syntax error, unexpected BOOL_FALSE, expecting sqlNULL or NOT in: "select '' as "False", f1 ! from booltbl2 ! where f1 is false" -MAPI = (monetdb) /var/tmp/mtest-1142/.s.monetdb.38959 +MAPI = (monetdb) /var/tmp/mtest-399/.s.monetdb.30210 QUERY = SELECT '' AS "Not True", f1 FROM BOOLTBL2 WHERE f1 IS NOT TRUE; @@ -161,7 +161,7 @@ ERROR = !syntax error, unexpected BOOL_T ! from booltbl2 ! where f1 is not true" -# 17:09:54 > -# 17:09:54 > "Done." -# 17:09:54 > +# 16:51:48 > +# 16:51:48 > "Done." +# 16:51:48 > diff --git a/sql/test/pg_regress/Tests/boolean.stable.out b/sql/test/pg_regress/Tests/boolean.stable.out --- a/sql/test/pg_regress/Tests/boolean.stable.out +++ b/sql/test/pg_regress/Tests/boolean.stable.out @@ -1,9 +1,9 @@ stdout of test 'boolean` in directory 'sql/test/pg_regress` itself: -# 17:09:53 > -# 17:09:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38959" "--set" "mapi_usock=/var/tmp/mtest-1142/.s.monetdb.38959" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress" "--set" "mal_listing=0" -# 17:09:53 > +# 16:51:47 > +# 16:51:47 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30210" "--set" "mapi_usock=/var/tmp/mtest-399/.s.monetdb.30210" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress" "--set" "mal_listing=0" +# 16:51:47 > # MonetDB 5 server v11.18.0 # This is an unreleased version @@ -13,16 +13,44 @@ stdout of test 'boolean` in directory 's # Copyright (c) 1993-July 2008 CWI. # Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved # Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://uwakai.da.cwi.nl:38959/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1142/.s.monetdb.38959 +# Listening for connection requests on mapi:monetdb://uwakai.da.cwi.nl:30210/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-399/.s.monetdb.30210 # MonetDB/GIS module loaded # MonetDB/SQL module loaded Ready. +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_querylog.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 19_cluster.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 24_zorder.sql +# loading sql script: 25_debug.sql +# loading sql script: 26_sysmon.sql +# loading sql script: 39_analytics.sql _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
