Changeset: 31204e928423 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31204e928423
Modified Files:
sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
sql/src/test/BugTracker-2009/Tests/double_count_limit_bug.SF-2862146.stable.out
sql/src/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
sql/src/test/BugTracker-2009/Tests/reorder.SF-2770608.stable.out
sql/src/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/src/test/Tests/orderby_non_selection_column.stable.out
Branch: Oct2010
Log Message:
approved output after (not so recent) changes
1) changed default variables (??)
2) changed order because of topn changes
diffs (120 lines):
diff -r 78e571cdb2e6 -r 31204e928423
sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
---
a/sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
Wed Sep 15 13:24:23 2010 +0200
+++
b/sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
Wed Sep 15 14:57:02 2010 +0200
@@ -68,9 +68,9 @@
# 22:29:10 > mclient -lsql -i -umonetdb -Pmonetdb --host=pegasus --port=30332
# 22:29:10 >
-MAPI = mone...@rig:35972
+MAPI = mone...@alf:32679
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !SQLException:zero_or_one:cardinality violation (53>1)
+ERROR = !SQLException:zero_or_one:cardinality violation (51>1)
# 13:22:15 >
# 13:22:15 > Done.
diff -r 78e571cdb2e6 -r 31204e928423
sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
---
a/sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
Wed Sep 15 13:24:23 2010 +0200
+++
b/sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
Wed Sep 15 14:57:02 2010 +0200
@@ -76,7 +76,6 @@
[ "derive_pipe" ]
[ "dictionary_pipe" ]
[ "compression_pipe" ]
-[ "opt_debug" ]
[ "gdk_mem_pagebits" ]
[ "gdk_mem_bigsize" ]
[ "monet_pid" ]
diff -r 78e571cdb2e6 -r 31204e928423
sql/src/test/BugTracker-2009/Tests/double_count_limit_bug.SF-2862146.stable.out
---
a/sql/src/test/BugTracker-2009/Tests/double_count_limit_bug.SF-2862146.stable.out
Wed Sep 15 13:24:23 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/double_count_limit_bug.SF-2862146.stable.out
Wed Sep 15 14:57:02 2010 +0200
@@ -26,8 +26,8 @@
# 22:42:43 >
#SELECT COUNT (*) AS c1, COUNT (*) AS c2 FROM t2 limit 100;
-% .t2, . # table_name
-% c1, single_value # name
+% .t2, .t2 # table_name
+% c1, c2 # name
% wrd, wrd # type
% 1, 1 # length
[ 0, 0 ]
diff -r 78e571cdb2e6 -r 31204e928423
sql/src/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
---
a/sql/src/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
Wed Sep 15 13:24:23 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
Wed Sep 15 14:57:02 2010 +0200
@@ -136,8 +136,8 @@
% value, type, prob # name
% varchar, char, double # type
% 2, 4, 22 # length
+[ "A2", "term", 1 ]
[ "A1", "term", 1 ]
-[ "A2", "term", 1 ]
# 23:06:18 >
# 23:06:18 > Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb
--host=localhost --port=31419
/home/wouter/opt/MonetDB-Aug2009/mTests/src/test/BugTracker-2009/old_views_incorrectly_reused.SF-2863804.view2.sql
@@ -147,8 +147,8 @@
% value, type, prob # name
% varchar, char, double # type
% 4, 4, 22 # length
+[ "2001", "term", 1 ]
[ "2000", "term", 1 ]
-[ "2001", "term", 1 ]
# 23:06:18 >
# 23:06:18 > Done.
diff -r 78e571cdb2e6 -r 31204e928423
sql/src/test/BugTracker-2009/Tests/reorder.SF-2770608.stable.out
--- a/sql/src/test/BugTracker-2009/Tests/reorder.SF-2770608.stable.out Wed Sep
15 13:24:23 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/reorder.SF-2770608.stable.out Wed Sep
15 14:57:02 2010 +0200
@@ -57,7 +57,7 @@
[ 25, "timestamp", "timestamptz", 7, 1, 0, 12, 0,
25, "timestamp", "timestamptz", 7, 1, 0, 12, 0
]
[ 26, "sqlblob", "blob", 0, 0, 0, 5, 0, 26,
"sqlblob", "blob", 0, 0, 0, 5, 0 ]
[ 5125, "url", "url", 0, 0, 0, 13, 2000, 5125,
"url", "url", 0, 0, 0, 13, 2000 ]
-[ 5191, "inet", "inet", 0, 0, 0, 13, 2000, 5191,
"inet", "inet", 0, 0, 0, 13, 2000 ]
+[ 5187, "inet", "inet", 0, 0, 0, 13, 2000, 5187,
"inet", "inet", 0, 0, 0, 13, 2000 ]
# 17:16:27 >
# 17:16:27 > Done.
diff -r 78e571cdb2e6 -r 31204e928423
sql/src/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
--- a/sql/src/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
Wed Sep 15 13:24:23 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
Wed Sep 15 14:57:02 2010 +0200
@@ -80,10 +80,10 @@
# 21:00:43 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=38808
# 21:00:43 >
-MAPI = mone...@rig:32327
+MAPI = mone...@alf:32679
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !SQLException:zero_or_one:cardinality violation (53>1)
-MAPI = mone...@rig:32327
+ERROR = !SQLException:zero_or_one:cardinality violation (51>1)
+MAPI = mone...@alf:32679
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
ERROR = !SQLException:zero_or_one:cardinality violation (288>1)
diff -r 78e571cdb2e6 -r 31204e928423
sql/src/test/Tests/orderby_non_selection_column.stable.out
--- a/sql/src/test/Tests/orderby_non_selection_column.stable.out Wed Sep
15 13:24:23 2010 +0200
+++ b/sql/src/test/Tests/orderby_non_selection_column.stable.out Wed Sep
15 14:57:02 2010 +0200
@@ -40,20 +40,20 @@
% test # name
% varchar # type
% 7 # length
+[ "mytest1" ]
+[ "mytest2" ]
+[ "mytest4" ]
[ "mytest3" ]
[ "mytest2" ]
[ "mytest1" ]
-[ "mytest4" ]
-[ "mytest2" ]
-[ "mytest1" ]
[ "mytest3" ]
% sys.lim_prob # table_name
% dir # name
% varchar # type
% 7 # length
+[ "mydir2/" ]
[ "mydir1/" ]
[ "mydir2/" ]
-[ "mydir2/" ]
[ "mydir1/" ]
[ "mydir2/" ]
[ "mydir1/" ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list