Changeset: 34aedabcf2a1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=34aedabcf2a1 Modified Files: Branch: default Log Message:
merge with Oct2010 diffs (150 lines): diff -r 5bd6954db601 -r 34aedabcf2a1 sql/src/test/ssqq/Tests/insert_queue.stable.out --- a/sql/src/test/ssqq/Tests/insert_queue.stable.out Fri Sep 17 10:46:55 2010 +0200 +++ b/sql/src/test/ssqq/Tests/insert_queue.stable.out Fri Sep 17 14:04:36 2010 +0200 @@ -41,48 +41,48 @@ [ 1, NULL, "select * from example", 0, NULL, NULL, NULL, NULL, NULL, NULL ] [ 2, 1, "select * from example", 0, NULL, NULL, NULL, NULL, NULL, NULL ] [ 3, NULL, "select * from example", 0, NULL, NULL, NULL, NULL, NULL, NULL ] -#select * from queue; -% sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue # table_name -% queue_id, query_id, queue_add, queue_number, os_version, monetdb_version, start_query, query_ready # name -% int, int, timestamp, int, varchar, varchar, timestamp, timestamp # type -% 1, 1, 26, 1, 0, 0, 26, 26 # length +#select queue_id, query_id, queue_number, os_version, monetdb_version, start_query, query_ready from queue; +% sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue # table_name +% queue_id, query_id, queue_number, os_version, monetdb_version, start_query, query_ready # name +% int, int, int, varchar, varchar, timestamp, timestamp # type +% 1, 1, 1, 0, 0, 26, 26 # length #select id_result; % . # table_name % single_value # name % int # type % 1 # length [ 1 ] -#select * from queue; -% sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue # table_name -% queue_id, query_id, queue_add, queue_number, os_version, monetdb_version, start_query, query_ready # name -% int, int, timestamp, int, varchar, varchar, timestamp, timestamp # type -% 1, 1, 26, 1, 5, 5, 26, 26 # length -[ 1, 1, 2010-08-05 13:07:52.000000, 0, "monet", "linux", NULL, NULL ] +#select queue_id, query_id, queue_number, os_version, monetdb_version, start_query, query_ready from queue; +% sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue # table_name +% queue_id, query_id, queue_number, os_version, monetdb_version, start_query, query_ready # name +% int, int, int, varchar, varchar, timestamp, timestamp # type +% 1, 1, 1, 5, 5, 26, 26 # length +[ 1, 1, 0, "monet", "linux", NULL, NULL ] #select id_result; % . # table_name % single_value # name % int # type % 2 # length [ -1 ] -#select * from queue; -% sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue # table_name -% queue_id, query_id, queue_add, queue_number, os_version, monetdb_version, start_query, query_ready # name -% int, int, timestamp, int, varchar, varchar, timestamp, timestamp # type -% 1, 1, 26, 1, 5, 5, 26, 26 # length -[ 1, 1, 2010-08-05 13:07:52.000000, 0, "monet", "linux", NULL, NULL ] +#select queue_id, query_id, queue_number, os_version, monetdb_version, start_query, query_ready from queue; +% sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue # table_name +% queue_id, query_id, queue_number, os_version, monetdb_version, start_query, query_ready # name +% int, int, int, varchar, varchar, timestamp, timestamp # type +% 1, 1, 1, 5, 5, 26, 26 # length +[ 1, 1, 0, "monet", "linux", NULL, NULL ] #select id_result; % . # table_name % single_value # name % int # type % 1 # length [ 3 ] -#select * from queue; -% sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue # table_name -% queue_id, query_id, queue_add, queue_number, os_version, monetdb_version, start_query, query_ready # name -% int, int, timestamp, int, varchar, varchar, timestamp, timestamp # type -% 1, 1, 26, 1, 5, 5, 26, 26 # length -[ 1, 1, 2010-08-05 13:07:52.000000, 0, "monet", "linux", NULL, NULL ] -[ 3, 2, 2010-08-05 13:07:52.000000, 0, "monet", "linux", NULL, NULL ] +#select queue_id, query_id, queue_number, os_version, monetdb_version, start_query, query_ready from queue; +% sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue # table_name +% queue_id, query_id, queue_number, os_version, monetdb_version, start_query, query_ready # name +% int, int, int, varchar, varchar, timestamp, timestamp # type +% 1, 1, 1, 5, 5, 26, 26 # length +[ 1, 1, 0, "monet", "linux", NULL, NULL ] +[ 3, 2, 0, "monet", "linux", NULL, NULL ] #select id_result; % . # table_name % single_value # name @@ -104,16 +104,16 @@ [ 1, NULL, "select * from example", 0, NULL, NULL, NULL, NULL, NULL, NULL ] [ 2, 1, "select * from example", 0, NULL, NULL, NULL, NULL, NULL, NULL ] [ 3, NULL, "select * from example", 0, NULL, NULL, NULL, NULL, NULL, NULL ] -#select * from queue; -% sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue # table_name -% queue_id, query_id, queue_add, queue_number, os_version, monetdb_version, start_query, query_ready # name -% int, int, timestamp, int, varchar, varchar, timestamp, timestamp # type -% 1, 1, 26, 1, 5, 5, 26, 26 # length -[ 1, 1, 2010-08-05 13:07:52.000000, 0, "monet", "linux", NULL, NULL ] -[ 3, 2, 2010-08-05 13:07:52.000000, 0, "monet", "linux", NULL, NULL ] -[ 4, 3, 2010-08-05 13:07:52.000000, 0, "monet", "linux", NULL, NULL ] +#select queue_id, query_id, queue_number, os_version, monetdb_version, start_query, query_ready from queue; +% sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue, sys.queue # table_name +% queue_id, query_id, queue_number, os_version, monetdb_version, start_query, query_ready # name +% int, int, int, varchar, varchar, timestamp, timestamp # type +% 1, 1, 1, 5, 5, 26, 26 # length +[ 1, 1, 0, "monet", "linux", NULL, NULL ] +[ 3, 2, 0, "monet", "linux", NULL, NULL ] +[ 4, 3, 0, "monet", "linux", NULL, NULL ] -# 15:07:52 > -# 15:07:52 > Done. -# 15:07:52 > +# 13:39:03 > +# 13:39:03 > Done. +# 13:39:03 > diff -r 5bd6954db601 -r 34aedabcf2a1 sql/src/test/ssqq/insert_queue.sql --- a/sql/src/test/ssqq/insert_queue.sql Fri Sep 17 10:46:55 2010 +0200 +++ b/sql/src/test/ssqq/insert_queue.sql Fri Sep 17 14:04:36 2010 +0200 @@ -2,7 +2,7 @@ select * from query; -select * from queue; +select queue_id, query_id, queue_number, os_version, monetdb_version, start_query, query_ready from queue; declare id_result int; @@ -12,7 +12,7 @@ select id_result; -select * from queue; +select queue_id, query_id, queue_number, os_version, monetdb_version, start_query, query_ready from queue; set id_result = -1; @@ -20,7 +20,7 @@ select id_result; -select * from queue; +select queue_id, query_id, queue_number, os_version, monetdb_version, start_query, query_ready from queue; set id_result = -1; @@ -28,7 +28,7 @@ select id_result; -select * from queue; +select queue_id, query_id, queue_number, os_version, monetdb_version, start_query, query_ready from queue; set id_result = -1; @@ -40,5 +40,5 @@ select * from query; -select * from queue; +select queue_id, query_id, queue_number, os_version, monetdb_version, start_query, query_ready from queue; _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
