Changeset: 31889236186b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31889236186b Modified Files: Branch: default Log Message:
Merge with Oct2010 branch. diffs (38 lines): diff -r 3da786e9c5c2 -r 31889236186b sql/src/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.sql --- a/sql/src/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.sql Fri Sep 10 16:12:52 2010 +0200 +++ b/sql/src/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.sql Fri Sep 10 17:10:20 2010 +0200 @@ -3,6 +3,7 @@ WHERE "keys"."id" = "keycolumns"."id" AND "keys"."table_id" = "tables"."id" AND "tables"."schema_id" = "schemas"."id" + AND "tables"."system" = FALSE AND "keys"."type" = 0; SELECT * @@ -10,5 +11,6 @@ WHERE "keys"."id" = "keycolumns"."id" AND "keys"."table_id" = "tables"."id" AND "tables"."schema_id" = "schemas"."id" + AND "tables"."system" = FALSE AND "keys"."type" = 0 ORDER BY "keycolumns"."column"; diff -r 3da786e9c5c2 -r 31889236186b sql/src/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out --- a/sql/src/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out Fri Sep 10 16:12:52 2010 +0200 +++ b/sql/src/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out Fri Sep 10 17:10:20 2010 +0200 @@ -29,14 +29,12 @@ % sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keycolumns, sys.keycolumns, sys.keycolumns, sys.keycolumns, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, sys.schemas, sys.schemas, sys.schemas, sys.schemas # table_name % id, table_id, type, name, rkey, action, id, column, trunc, nr, id, name, schema_id, query, type, system, commit_action, readonly, temporary, id, name, authorization, owner # name % int, int, int, varchar, int, int, int, varchar, int, int, int, varchar, int, varchar, smallint, boolean, smallint, boolean, tinyint, int, varchar, int, int # type -% 4, 4, 1, 20, 2, 2, 4, 2, 1, 1, 4, 12, 4, 0, 1, 5, 1, 5, 1, 4, 3, 1, 1 # length -[ 5222, 5229, 0, "queryhistory_id_pkey", -1, -1, 5222, "id", 0, 0, 5229, "queryhistory", 2000, NULL, 0, false, 0, false, 0, 2000, "sys", 2, 3 ] +% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 5, 1, 5, 1, 1, 0, 1, 1 # length #SELECT * % sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keycolumns, sys.keycolumns, sys.keycolumns, sys.keycolumns, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, sys.schemas, sys.schemas, sys.schemas, sys.schemas # table_name % id, table_id, type, name, rkey, action, id, column, trunc, nr, id, name, schema_id, query, type, system, commit_action, readonly, temporary, id, name, authorization, owner # name % int, int, int, varchar, int, int, int, varchar, int, int, int, varchar, int, varchar, smallint, boolean, smallint, boolean, tinyint, int, varchar, int, int # type -% 4, 4, 1, 20, 2, 2, 4, 2, 1, 1, 4, 12, 4, 0, 1, 5, 1, 5, 1, 4, 3, 1, 1 # length -[ 5222, 5229, 0, "queryhistory_id_pkey", -1, -1, 5222, "id", 0, 0, 5229, "queryhistory", 2000, NULL, 0, false, 0, false, 0, 2000, "sys", 2, 3 ] +% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 5, 1, 5, 1, 1, 0, 1, 1 # length # 19:37:26 > # 19:37:26 > Done. _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
