Changeset: 76863e772051 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=76863e772051 Modified Files: sql/test/Tests/constant-not-in.stable.out sql/test/Tests/identifiers.stable.out sql/test/Tests/orderby_limit.stable.out Branch: sq2default Log Message:
approved output diffs (130 lines): diff --git a/sql/test/Tests/constant-not-in.stable.out b/sql/test/Tests/constant-not-in.stable.out --- a/sql/test/Tests/constant-not-in.stable.out +++ b/sql/test/Tests/constant-not-in.stable.out @@ -63,7 +63,7 @@ stdout of test 'constant-not-in` in dire #INSERT INTO mytable VALUES (1); [ 1 ] #SELECT 'b' AS c FROM mytable; -% .L2 # table_name +% . # table_name % c # name % char # type % 1 # length diff --git a/sql/test/Tests/identifiers.stable.out b/sql/test/Tests/identifiers.stable.out --- a/sql/test/Tests/identifiers.stable.out +++ b/sql/test/Tests/identifiers.stable.out @@ -25,31 +25,31 @@ stdout of test 'identifiers` in director # 11:50:07 > #SELECT 1 AS bla; -- gives bla -% .L2 # table_name +% . # table_name % bla # name % tinyint # type % 1 # length [ 1 ] #SELECT 1 AS BLA; -- gives bla -% .L2 # table_name +% . # table_name % bla # name % tinyint # type % 1 # length [ 1 ] #SELECT 1 AS "bla"; -- gives bla -% .L2 # table_name +% . # table_name % bla # name % tinyint # type % 1 # length [ 1 ] #SELECT 1 AS "Bla"; -- gives Bla -% .L2 # table_name +% . # table_name % Bla # name % tinyint # type % 1 # length [ 1 ] #SELECT 1 AS "BLA"; -- gives BLA -% .L2 # table_name +% . # table_name % BLA # name % tinyint # type % 1 # length diff --git a/sql/test/Tests/orderby_limit.stable.out b/sql/test/Tests/orderby_limit.stable.out --- a/sql/test/Tests/orderby_limit.stable.out +++ b/sql/test/Tests/orderby_limit.stable.out @@ -1,41 +1,41 @@ stdout of test 'orderby_limit` in directory 'sql/test` itself: -# 18:28:18 > -# 18:28:18 > mserver5 "--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=4 --set "monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=39921 --set xrpc_port=45986 --set monet_prompt= --trace "--dbname=mTests_src_test" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 18:28:18 > - -# MonetDB server v5.9.0, based on kernel v1.27.0 -# Serving database 'mTests_src_test', using 4 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008- MonetDB B.V., all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:39921/ -# MonetDB/SQL module v2.27.0 loaded +# 15:30:54 > +# 15:30:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31229" "--set" "mapi_usock=/var/tmp/mtest-18654/.s.monetdb.31229" "--forcemito" "--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test" "--set" "embedded_c=true" +# 15:30:54 > -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -#function user.main():void; -# clients.quit(); -#end main; +# MonetDB 5 server v11.36.0 (hg id: 8f43ee7f9545+) +# This is an unreleased version +# Serving database 'mTests_sql_test', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 15.384 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://localhost.localdomain:31229/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-18654/.s.monetdb.31229 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# 15:30:55 > +# 15:30:55 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-18654" "--port=31229" +# 15:30:55 > -# 19:06:01 > -# 19:06:01 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=localhost --port=37501 < orderby_limit.sql -# 19:06:01 > - +#start transaction; +#create table lim_prob(dir varchar(30), test varchar(30)); +#insert into lim_prob values ('mydir1/', 'mytest1'); [ 1 ] +#insert into lim_prob values ('mydir2/', 'mytest3'); [ 1 ] +#insert into lim_prob values ('mydir1/', 'mytest2'); [ 1 ] [ 1 ] [ 1 ] [ 1 ] [ 1 ] #select distinct concat("dir", "test") as a from lim_prob order by a limit 10; -% sys.L2 # table_name +% sys. # table_name % a # name % varchar # type % 14 # length @@ -47,7 +47,7 @@ stdout of test 'orderby_limit` in direct [ "mydir2/mytest2" ] [ "mydir2/mytest3" ] #select distinct concat("dir", "test") as a from lim_prob order by a; -% sys.L2 # table_name +% sys. # table_name % a # name % varchar # type % 14 # length _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
