Changeset: f48dc0895f4d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f48dc0895f4d Modified Files: monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal sql/test/ssqq/Tests/insert_query.stable.out sql/test/ssqq/Tests/insert_queue.stable.out sql/test/ssqq/insert_queue.sql Branch: Jul2012 Log Message:
merging diffs (73 lines): diff --git a/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal b/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal --- a/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal +++ b/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal @@ -16,6 +16,4 @@ # All Rights Reserved. # This loads the opt_sql_append optimizer module -library opt_sql_append; include opt_sql_append; - diff --git a/sql/test/ssqq/Tests/insert_query.stable.out b/sql/test/ssqq/Tests/insert_query.stable.out --- a/sql/test/ssqq/Tests/insert_query.stable.out +++ b/sql/test/ssqq/Tests/insert_query.stable.out @@ -85,7 +85,7 @@ Ready. % single_value # name % int # type % 1 # length -[ 4 ] +[ 3 ] #select * from quser; % sys.quser, sys.quser, sys.quser, sys.quser, sys.quser, sys.quser # table_name % quser_id, user_name, uid, emailaddress, password, enabled # name @@ -100,7 +100,7 @@ Ready. % 1, 1, 21, 1, 5, 5, 0, 1, 0, 0 # length [ 1, NULL, "select * from example", 0, NULL, NULL, NULL, NULL, NULL, NULL ] [ 2, 1, "select * from example", 0, NULL, NULL, NULL, NULL, NULL, NULL ] -[ 4, NULL, "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 diff --git a/sql/test/ssqq/Tests/insert_queue.stable.out b/sql/test/ssqq/Tests/insert_queue.stable.out --- a/sql/test/ssqq/Tests/insert_queue.stable.out +++ b/sql/test/ssqq/Tests/insert_queue.stable.out @@ -39,7 +39,7 @@ Ready. % 1, 1, 21, 1, 5, 5, 0, 1, 0, 0 # length [ 1, NULL, "select * from example", 0, NULL, NULL, NULL, NULL, NULL, NULL ] [ 2, 1, "select * from example", 0, NULL, NULL, NULL, NULL, NULL, NULL ] -[ 4, NULL, "select * from example", 0, NULL, NULL, NULL, NULL, NULL, NULL ] +[ 3, NULL, "select * from example", 0, NULL, NULL, NULL, NULL, 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 @@ -102,7 +102,7 @@ Ready. % 1, 1, 21, 1, 5, 5, 0, 1, 0, 0 # length [ 1, NULL, "select * from example", 0, NULL, NULL, NULL, NULL, NULL, NULL ] [ 2, 1, "select * from example", 0, NULL, NULL, NULL, NULL, NULL, NULL ] -[ 4, NULL, "select * from example", 0, NULL, NULL, NULL, NULL, NULL, NULL ] +[ 3, NULL, "select * from example", 0, NULL, NULL, NULL, NULL, 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 @@ -110,7 +110,7 @@ Ready. % 1, 1, 1, 5, 5, 26, 26 # length [ 1, 1, 0, "monet", "linux", NULL, NULL ] [ 3, 2, 0, "monet", "linux", NULL, NULL ] -[ 4, 4, 0, "monet", "linux", NULL, NULL ] +[ 4, 3, 0, "monet", "linux", NULL, NULL ] # 13:39:03 > # 13:39:03 > Done. diff --git a/sql/test/ssqq/insert_queue.sql b/sql/test/ssqq/insert_queue.sql --- a/sql/test/ssqq/insert_queue.sql +++ b/sql/test/ssqq/insert_queue.sql @@ -32,7 +32,7 @@ select queue_id, query_id, queue_number, set id_result = -1; -set id_result = insert_queue(4, 'monet', 'linux'); +set id_result = insert_queue(3, 'monet', 'linux'); select id_result; _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
