Changeset: 1876ae6b1b7b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1876ae6b1b7b Modified Files: Branch: default Log Message:
Merge. diffs (90 lines): diff -r 052ca06a2133 -r 1876ae6b1b7b sql/src/test/BugConstraints/Tests/add_constraint_1643522.stable.err --- a/sql/src/test/BugConstraints/Tests/add_constraint_1643522.stable.err Wed Jul 14 15:34:11 2010 +0200 +++ b/sql/src/test/BugConstraints/Tests/add_constraint_1643522.stable.err Wed Jul 14 15:34:27 2010 +0200 @@ -12,7 +12,7 @@ # 12:55:03 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=localhost --port=33669 < add_constraint_1643522.sql # 12:55:03 > -MAPI = mone...@eir:36604 +MAPI = mone...@localhost:36507 QUERY = alter table t1 add constraint id_p primary key(id); ERROR = !CONSTRAINT PRIMARY KEY: key id_p already exists diff -r 052ca06a2133 -r 1876ae6b1b7b sql/src/test/BugConstraints/Tests/add_constraint_1643522.stable.out --- a/sql/src/test/BugConstraints/Tests/add_constraint_1643522.stable.out Wed Jul 14 15:34:11 2010 +0200 +++ b/sql/src/test/BugConstraints/Tests/add_constraint_1643522.stable.out Wed Jul 14 15:34:27 2010 +0200 @@ -25,7 +25,6 @@ % 20 # length [ "queryhistory_id_pkey" ] [ "callhistory_id_fkey" ] -[ "vault_vid_pkey" ] [ "id_p" ] % sys.keys # table_name % name # name @@ -33,7 +32,6 @@ % 20 # length [ "queryhistory_id_pkey" ] [ "callhistory_id_fkey" ] -[ "vault_vid_pkey" ] # 11:09:09 > # 11:09:09 > Done. diff -r 052ca06a2133 -r 1876ae6b1b7b sql/src/test/Tests/keys.stable.out --- a/sql/src/test/Tests/keys.stable.out Wed Jul 14 15:34:11 2010 +0200 +++ b/sql/src/test/Tests/keys.stable.out Wed Jul 14 15:34:27 2010 +0200 @@ -35,7 +35,6 @@ % 27, 1, 20, 1 # length [ "queryhistory_id_pkey", 0, "queryhistory_id_pkey", 0 ] [ "callhistory_id_fkey", 1, "callhistory_id_fkey", 2 ] -[ "vault_vid_pkey", 0, "vault_vid_pkey", 0 ] [ "unique_key", 0, "unique_key", 1 ] [ "allnewtriples_subject_idx", 0, NULL, NULL ] [ "allnewtriples_predicate_idx", 0, NULL, NULL ] @@ -46,7 +45,6 @@ % 20, 1, 20, 1 # length [ "queryhistory_id_pkey", 0, "queryhistory_id_pkey", 0 ] [ "callhistory_id_fkey", 1, "callhistory_id_fkey", 2 ] -[ "vault_vid_pkey", 0, "vault_vid_pkey", 0 ] [ "unique_key", 0, "unique_key", 1 ] # 12:37:07 > diff -r 052ca06a2133 -r 1876ae6b1b7b sql/src/test/Tests/restart-sequence.stable.out --- a/sql/src/test/Tests/restart-sequence.stable.out Wed Jul 14 15:34:11 2010 +0200 +++ b/sql/src/test/Tests/restart-sequence.stable.out Wed Jul 14 15:34:27 2010 +0200 @@ -33,8 +33,7 @@ % sys.q, sys.s, sys.q, sys.q, sys.q, sys.q, sys.q, sys.q # table_name % name, name, start, minvalue, maxvalue, increment, cacheinc, cycle # name % varchar, varchar, bigint, bigint, bigint, bigint, bigint, boolean # type -% 7, 3, 1, 1, 1, 1, 1, 5 # length -[ "vaultid", "sys", 1, 0, 0, 1, 1, false ] +% 6, 3, 1, 1, 1, 1, 1, 5 # length [ "mytest", "sys", 1, 0, 0, 1, 1, false ] % . # table_name % next_value_for_sys # name @@ -49,14 +48,12 @@ % sys.q, sys.s, sys.q, sys.q, sys.q, sys.q, sys.q, sys.q # table_name % name, name, start, minvalue, maxvalue, increment, cacheinc, cycle # name % varchar, varchar, bigint, bigint, bigint, bigint, bigint, boolean # type -% 7, 3, 1, 1, 1, 1, 1, 5 # length -[ "vaultid", "sys", 1, 0, 0, 1, 1, false ] +% 6, 3, 1, 1, 1, 1, 1, 5 # length [ "mytest", "sys", 1, 0, 0, 1, 1, false ] % sys.q, sys.s, sys.q, sys.q, sys.q, sys.q, sys.q, sys.q # table_name % name, name, start, minvalue, maxvalue, increment, cacheinc, cycle # name % varchar, varchar, bigint, bigint, bigint, bigint, bigint, boolean # type -% 7, 3, 2, 1, 1, 1, 1, 5 # length -[ "vaultid", "sys", 1, 0, 0, 1, 1, false ] +% 6, 3, 2, 1, 1, 1, 1, 5 # length [ "mytest", "sys", 10, 0, 0, 1, 1, false ] % . # table_name % next_value_for_sys # name @@ -71,8 +68,7 @@ % sys.q, sys.s, sys.q, sys.q, sys.q, sys.q, sys.q, sys.q # table_name % name, name, start, minvalue, maxvalue, increment, cacheinc, cycle # name % varchar, varchar, bigint, bigint, bigint, bigint, bigint, boolean # type -% 7, 3, 2, 1, 1, 1, 1, 5 # length -[ "vaultid", "sys", 1, 0, 0, 1, 1, false ] +% 6, 3, 2, 1, 1, 1, 1, 5 # length [ "mytest", "sys", 10, 0, 0, 1, 1, false ] # 20:40:09 > _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
