Changeset: c5073f462198 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c5073f462198
Modified Files:
sql/src/test/BugTracker-2009/Tests/alter_table_drop_constraint.SF-2803477.sql
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
sql/src/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.stable.out
sql/src/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
sql/src/test/leaks/Tests/check2.stable.out
sql/src/test/leaks/Tests/check3.stable.out
sql/src/test/leaks/Tests/check4.stable.out
sql/src/test/leaks/Tests/drop3.stable.out
sql/src/test/leaks/Tests/select1.stable.out
sql/src/test/leaks/Tests/select2.stable.out
sql/src/test/osm/Tests/drop_constraint_bug.stable.err
Branch: default
Log Message:
approved output
diffs (189 lines):
diff -r 161a673899c4 -r c5073f462198
sql/src/test/BugTracker-2009/Tests/alter_table_drop_constraint.SF-2803477.sql
---
a/sql/src/test/BugTracker-2009/Tests/alter_table_drop_constraint.SF-2803477.sql
Wed May 19 21:43:06 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/alter_table_drop_constraint.SF-2803477.sql
Wed May 19 21:44:52 2010 +0200
@@ -32,7 +32,5 @@
ALTER TABLE TABLE_B
DROP CONSTRAINT UNQ_VALUE_C;
-DROP INDEX UNQ_VALUE_C;
-
ALTER TABLE TABLE_B
ADD CONSTRAINT FK_TABLE_A_ID FOREIGN KEY ( TABLE_A_ID ) REFERENCES TABLE_A
( TABLE_A_ID );
diff -r 161a673899c4 -r c5073f462198
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
---
a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
Wed May 19 21:43:06 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
Wed May 19 21:44:52 2010 +0200
@@ -25,7 +25,6 @@
# 11:17:13 > mclient -lsql -ftest -i -e --host=alf --port=39432
# 11:17:13 >
-TABLE sys.queryhistory
TABLE sys.url_test
CREATE TABLE "sys"."triggers" (
"id" int,
diff -r 161a673899c4 -r c5073f462198
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
--- a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
Wed May 19 21:43:06 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
Wed May 19 21:44:52 2010 +0200
@@ -30,7 +30,6 @@
# 11:17:12 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=alf
--port=39432 -i <
/net/alf.ins.cwi.nl/export/scratch1/niels/MonetDB/sql/src/test/BugTracker-2009/Tests/../dumping_tables.SF-2776908.sql
# 11:17:12 >
-TABLE sys.queryhistory
TABLE sys.url_test
CREATE TABLE "sys"."triggers" (
"id" int,
diff -r 161a673899c4 -r c5073f462198
sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
---
a/sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
Wed May 19 21:43:06 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
Wed May 19 21:44:52 2010 +0200
@@ -37,24 +37,6 @@
"theurl" url,
"name" CHARACTER LARGE OBJECT
);
-CREATE TABLE "sys"."queryhistory" (
- "id" bigint NOT NULL,
- "defined" TIMESTAMP,
- "name" CHARACTER LARGE OBJECT,
- "query" CHARACTER LARGE OBJECT,
- "parse" bigint,
- "optimize" bigint,
- CONSTRAINT "queryhistory_id_pkey" PRIMARY KEY ("id")
-);
-COPY 3 RECORDS INTO "sys"."queryhistory" FROM stdin USING DELIMITERS
'\t','\n','"';
-1026870 2010-05-18 11:49:13.000000 "monetdb" "select id from
tables where id > 0;" 4553 1677
-1027100 2010-05-18 11:49:13.000000 "monetdb" "create table
t1 (id int);" 116 332
-1027156 2010-05-18 11:49:13.000000 "monetdb" "drop table
t1;" 70 285
-create procedure resethistory()
-begin
- delete from callhistory;
- delete from queryhistory;
-end;
-- The contents of this file are subject to the MonetDB Public License
-- Version 1.1 (the "License"); you may not use this file except in
-- compliance with the License. You may obtain a copy of the License at
diff -r 161a673899c4 -r c5073f462198
sql/src/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.stable.out
---
a/sql/src/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.stable.out
Wed May 19 21:43:06 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.stable.out
Wed May 19 21:44:52 2010 +0200
@@ -59,7 +59,7 @@
[ 5129 ]
[ 5229 ]
[ 5243 ]
-[ 5259 ]
+[ 5260 ]
Drop history
# 23:32:55 >
diff -r 161a673899c4 -r c5073f462198
sql/src/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
--- a/sql/src/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
Wed May 19 21:43:06 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
Wed May 19 21:44:52 2010 +0200
@@ -16,7 +16,6 @@
def main():
srv = server_start(["--set", "sql_debug=64"])
- client('SQL' , os.path.join(os.getenv('RELSRCDIR'), '..', '..', '..',
'sql', 'skyserver.sql'))
client('SQL' , os.path.join(os.getenv('RELSRCDIR'),
'mdb_starts_with_sql_debug_64.SF-1999354.sql'))
srv.communicate()
diff -r 161a673899c4 -r c5073f462198 sql/src/test/leaks/Tests/check2.stable.out
--- a/sql/src/test/leaks/Tests/check2.stable.out Wed May 19 21:43:06
2010 +0200
+++ b/sql/src/test/leaks/Tests/check2.stable.out Wed May 19 21:44:52
2010 +0200
@@ -186,7 +186,7 @@
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 161 ]
+[ "transient", 155 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L3, .bbp # table_name
% L3, L4 # name
diff -r 161a673899c4 -r c5073f462198 sql/src/test/leaks/Tests/check3.stable.out
--- a/sql/src/test/leaks/Tests/check3.stable.out Wed May 19 21:43:06
2010 +0200
+++ b/sql/src/test/leaks/Tests/check3.stable.out Wed May 19 21:44:52
2010 +0200
@@ -186,7 +186,7 @@
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 178 ]
+[ "transient", 175 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L3, .bbp # table_name
% L3, L4 # name
diff -r 161a673899c4 -r c5073f462198 sql/src/test/leaks/Tests/check4.stable.out
--- a/sql/src/test/leaks/Tests/check4.stable.out Wed May 19 21:43:06
2010 +0200
+++ b/sql/src/test/leaks/Tests/check4.stable.out Wed May 19 21:44:52
2010 +0200
@@ -186,7 +186,7 @@
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 181 ]
+[ "transient", 178 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L3, .bbp # table_name
% L3, L4 # name
diff -r 161a673899c4 -r c5073f462198 sql/src/test/leaks/Tests/drop3.stable.out
--- a/sql/src/test/leaks/Tests/drop3.stable.out Wed May 19 21:43:06 2010 +0200
+++ b/sql/src/test/leaks/Tests/drop3.stable.out Wed May 19 21:44:52 2010 +0200
@@ -29,7 +29,7 @@
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 181 ]
+[ "transient", 185 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L3, .bbp # table_name
% L3, L4 # name
diff -r 161a673899c4 -r c5073f462198 sql/src/test/leaks/Tests/select1.stable.out
--- a/sql/src/test/leaks/Tests/select1.stable.out Wed May 19 21:43:06
2010 +0200
+++ b/sql/src/test/leaks/Tests/select1.stable.out Wed May 19 21:44:52
2010 +0200
@@ -34,7 +34,7 @@
% L1 # name
% wrd # type
% 3 # length
-[ 139 ]
+[ 144 ]
#select 1;
% . # table_name
% single_value # name
@@ -45,7 +45,7 @@
% L1 # name
% wrd # type
% 3 # length
-[ 139 ]
+[ 140 ]
# 22:03:05 >
# 22:03:05 > Done.
diff -r 161a673899c4 -r c5073f462198 sql/src/test/leaks/Tests/select2.stable.out
--- a/sql/src/test/leaks/Tests/select2.stable.out Wed May 19 21:43:06
2010 +0200
+++ b/sql/src/test/leaks/Tests/select2.stable.out Wed May 19 21:44:52
2010 +0200
@@ -34,7 +34,7 @@
% L1 # name
% wrd # type
% 3 # length
-[ 141 ]
+[ 139 ]
#select 1;
% . # table_name
% single_value # name
@@ -45,7 +45,7 @@
% L1 # name
% wrd # type
% 3 # length
-[ 140 ]
+[ 139 ]
# 22:03:05 >
# 22:03:05 > Done.
diff -r 161a673899c4 -r c5073f462198
sql/src/test/osm/Tests/drop_constraint_bug.stable.err
--- a/sql/src/test/osm/Tests/drop_constraint_bug.stable.err Wed May 19
21:43:06 2010 +0200
+++ b/sql/src/test/osm/Tests/drop_constraint_bug.stable.err Wed May 19
21:44:52 2010 +0200
@@ -79,9 +79,9 @@
# 14:06:51 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=35987
# 14:06:51 >
-MAPI = mone...@pegasus:34876
+MAPI = mone...@alf:33511
QUERY = alter table ways drop constraint ways_id_pkey;
-ERROR = !ALTER TABLE: cannot drop constraint 'ways_id_pkey': there are
database objects which depend on it
+ERROR = !SQLException:sql.catalog:ALTER TABLE: cannot drop constraint
'ways_id_pkey': there are database objects which depend on it
# 14:06:51 >
# 14:06:51 > Done.
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
