Changeset: 28a5502ae07a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=28a5502ae07a
Modified Files:
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: default
Log Message:
approved new output after latest code changes
diffs (244 lines):
diff --git
a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
--- a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
+++ b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
@@ -85,7 +85,7 @@ QUERY = select * from env() as env where
ERROR = !cardinality violation (21>1)
MAPI = monetdb@niels:39633
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
-ERROR = !cardinality violation (299>1)
+ERROR = !cardinality violation (300>1)
# 21:00:43 >
# 21:00:43 > Done.
diff --git a/sql/test/leaks/Tests/check1.stable.out
b/sql/test/leaks/Tests/check1.stable.out
--- a/sql/test/leaks/Tests/check1.stable.out
+++ b/sql/test/leaks/Tests/check1.stable.out
@@ -34,7 +34,7 @@ Ready.
[ "oid", "bit", 0 ]
[ "oid", "bit", 59 ]
[ "oid", "bit", 59 ]
-[ "oid", "bit", 299 ]
+[ "oid", "bit", 300 ]
[ "oid", "bit", 1125 ]
[ "oid", "bit", 1125 ]
[ "oid", "int", 0 ]
@@ -78,11 +78,11 @@ Ready.
[ "oid", "int", 59 ]
[ "oid", "int", 195 ]
[ "oid", "int", 195 ]
-[ "oid", "int", 299 ]
-[ "oid", "int", 299 ]
-[ "oid", "int", 299 ]
-[ "oid", "int", 299 ]
-[ "oid", "int", 299 ]
+[ "oid", "int", 300 ]
+[ "oid", "int", 300 ]
+[ "oid", "int", 300 ]
+[ "oid", "int", 300 ]
+[ "oid", "int", 300 ]
[ "oid", "int", 1125 ]
[ "oid", "int", 1125 ]
[ "oid", "int", 1125 ]
@@ -162,10 +162,10 @@ Ready.
[ "oid", "str", 42 ]
[ "oid", "str", 59 ]
[ "oid", "str", 59 ]
-[ "oid", "str", 299 ]
-[ "oid", "str", 299 ]
-[ "oid", "str", 299 ]
-[ "oid", "str", 299 ]
+[ "oid", "str", 300 ]
+[ "oid", "str", 300 ]
+[ "oid", "str", 300 ]
+[ "oid", "str", 300 ]
[ "oid", "str", 1125 ]
[ "oid", "str", 1125 ]
[ "oid", "str", 1125 ]
diff --git a/sql/test/leaks/Tests/check2.stable.out
b/sql/test/leaks/Tests/check2.stable.out
--- a/sql/test/leaks/Tests/check2.stable.out
+++ b/sql/test/leaks/Tests/check2.stable.out
@@ -34,7 +34,7 @@ Ready.
[ "oid", "bit", 0 ]
[ "oid", "bit", 59 ]
[ "oid", "bit", 59 ]
-[ "oid", "bit", 299 ]
+[ "oid", "bit", 300 ]
[ "oid", "bit", 1125 ]
[ "oid", "bit", 1125 ]
[ "oid", "int", 0 ]
@@ -78,11 +78,11 @@ Ready.
[ "oid", "int", 59 ]
[ "oid", "int", 195 ]
[ "oid", "int", 195 ]
-[ "oid", "int", 299 ]
-[ "oid", "int", 299 ]
-[ "oid", "int", 299 ]
-[ "oid", "int", 299 ]
-[ "oid", "int", 299 ]
+[ "oid", "int", 300 ]
+[ "oid", "int", 300 ]
+[ "oid", "int", 300 ]
+[ "oid", "int", 300 ]
+[ "oid", "int", 300 ]
[ "oid", "int", 1125 ]
[ "oid", "int", 1125 ]
[ "oid", "int", 1125 ]
@@ -162,10 +162,10 @@ Ready.
[ "oid", "str", 42 ]
[ "oid", "str", 59 ]
[ "oid", "str", 59 ]
-[ "oid", "str", 299 ]
-[ "oid", "str", 299 ]
-[ "oid", "str", 299 ]
-[ "oid", "str", 299 ]
+[ "oid", "str", 300 ]
+[ "oid", "str", 300 ]
+[ "oid", "str", 300 ]
+[ "oid", "str", 300 ]
[ "oid", "str", 1125 ]
[ "oid", "str", 1125 ]
[ "oid", "str", 1125 ]
diff --git a/sql/test/leaks/Tests/check3.stable.out
b/sql/test/leaks/Tests/check3.stable.out
--- a/sql/test/leaks/Tests/check3.stable.out
+++ b/sql/test/leaks/Tests/check3.stable.out
@@ -34,7 +34,7 @@ Ready.
[ "oid", "bit", 0 ]
[ "oid", "bit", 60 ]
[ "oid", "bit", 60 ]
-[ "oid", "bit", 301 ]
+[ "oid", "bit", 302 ]
[ "oid", "bit", 1125 ]
[ "oid", "bit", 1125 ]
[ "oid", "int", 0 ]
@@ -78,11 +78,11 @@ Ready.
[ "oid", "int", 60 ]
[ "oid", "int", 195 ]
[ "oid", "int", 195 ]
-[ "oid", "int", 301 ]
-[ "oid", "int", 301 ]
-[ "oid", "int", 301 ]
-[ "oid", "int", 301 ]
-[ "oid", "int", 301 ]
+[ "oid", "int", 302 ]
+[ "oid", "int", 302 ]
+[ "oid", "int", 302 ]
+[ "oid", "int", 302 ]
+[ "oid", "int", 302 ]
[ "oid", "int", 1125 ]
[ "oid", "int", 1125 ]
[ "oid", "int", 1125 ]
@@ -162,10 +162,10 @@ Ready.
[ "oid", "str", 42 ]
[ "oid", "str", 60 ]
[ "oid", "str", 60 ]
-[ "oid", "str", 301 ]
-[ "oid", "str", 301 ]
-[ "oid", "str", 301 ]
-[ "oid", "str", 301 ]
+[ "oid", "str", 302 ]
+[ "oid", "str", 302 ]
+[ "oid", "str", 302 ]
+[ "oid", "str", 302 ]
[ "oid", "str", 1125 ]
[ "oid", "str", 1125 ]
[ "oid", "str", 1125 ]
diff --git a/sql/test/leaks/Tests/check4.stable.out
b/sql/test/leaks/Tests/check4.stable.out
--- a/sql/test/leaks/Tests/check4.stable.out
+++ b/sql/test/leaks/Tests/check4.stable.out
@@ -34,7 +34,7 @@ Ready.
[ "oid", "bit", 0 ]
[ "oid", "bit", 61 ]
[ "oid", "bit", 61 ]
-[ "oid", "bit", 303 ]
+[ "oid", "bit", 304 ]
[ "oid", "bit", 1125 ]
[ "oid", "bit", 1125 ]
[ "oid", "int", 0 ]
@@ -78,11 +78,11 @@ Ready.
[ "oid", "int", 61 ]
[ "oid", "int", 195 ]
[ "oid", "int", 195 ]
-[ "oid", "int", 303 ]
-[ "oid", "int", 303 ]
-[ "oid", "int", 303 ]
-[ "oid", "int", 303 ]
-[ "oid", "int", 303 ]
+[ "oid", "int", 304 ]
+[ "oid", "int", 304 ]
+[ "oid", "int", 304 ]
+[ "oid", "int", 304 ]
+[ "oid", "int", 304 ]
[ "oid", "int", 1125 ]
[ "oid", "int", 1125 ]
[ "oid", "int", 1125 ]
@@ -162,10 +162,10 @@ Ready.
[ "oid", "str", 42 ]
[ "oid", "str", 61 ]
[ "oid", "str", 61 ]
-[ "oid", "str", 303 ]
-[ "oid", "str", 303 ]
-[ "oid", "str", 303 ]
-[ "oid", "str", 303 ]
+[ "oid", "str", 304 ]
+[ "oid", "str", 304 ]
+[ "oid", "str", 304 ]
+[ "oid", "str", 304 ]
[ "oid", "str", 1125 ]
[ "oid", "str", 1125 ]
[ "oid", "str", 1125 ]
diff --git a/sql/test/leaks/Tests/check5.stable.out
b/sql/test/leaks/Tests/check5.stable.out
--- a/sql/test/leaks/Tests/check5.stable.out
+++ b/sql/test/leaks/Tests/check5.stable.out
@@ -34,7 +34,7 @@ Ready.
[ "oid", "bit", 0 ]
[ "oid", "bit", 61 ]
[ "oid", "bit", 61 ]
-[ "oid", "bit", 303 ]
+[ "oid", "bit", 304 ]
[ "oid", "bit", 1125 ]
[ "oid", "bit", 1125 ]
[ "oid", "int", 0 ]
@@ -78,11 +78,11 @@ Ready.
[ "oid", "int", 61 ]
[ "oid", "int", 195 ]
[ "oid", "int", 195 ]
-[ "oid", "int", 303 ]
-[ "oid", "int", 303 ]
-[ "oid", "int", 303 ]
-[ "oid", "int", 303 ]
-[ "oid", "int", 303 ]
+[ "oid", "int", 304 ]
+[ "oid", "int", 304 ]
+[ "oid", "int", 304 ]
+[ "oid", "int", 304 ]
+[ "oid", "int", 304 ]
[ "oid", "int", 1125 ]
[ "oid", "int", 1125 ]
[ "oid", "int", 1125 ]
@@ -162,10 +162,10 @@ Ready.
[ "oid", "str", 42 ]
[ "oid", "str", 61 ]
[ "oid", "str", 61 ]
-[ "oid", "str", 303 ]
-[ "oid", "str", 303 ]
-[ "oid", "str", 303 ]
-[ "oid", "str", 303 ]
+[ "oid", "str", 304 ]
+[ "oid", "str", 304 ]
+[ "oid", "str", 304 ]
+[ "oid", "str", 304 ]
[ "oid", "str", 1125 ]
[ "oid", "str", 1125 ]
[ "oid", "str", 1125 ]
diff --git a/sql/test/mapi/Tests/php_monetdb.stable.out
b/sql/test/mapi/Tests/php_monetdb.stable.out
--- a/sql/test/mapi/Tests/php_monetdb.stable.out
+++ b/sql/test/mapi/Tests/php_monetdb.stable.out
@@ -89,7 +89,7 @@ 5014 privileges 2000 0 true 0
false 0
5135 queryhistory 2000 0 true 0 false 0
5149 callhistory 2000 0 true 0 false 0
5166 querylog 2000 create view querylog asnselect qd.*, ql.ctime,
ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock,
ql.oublock from queryhistory qd, callhistory qlnwhere qd.id = ql.id; 1
true 0 false 0
-5614 systemfunctions 2000 0 true 0 false 0
+5615 systemfunctions 2000 0 true 0 false 0
# 16:44:51 >
# 16:44:51 > "Done."
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
