Changeset: 68af64cc242c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68af64cc242c Modified Files: sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out sql/test/leaks/Tests/check0.stable.out 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: Jul2012 Log Message:
Approve after merge. diffs (truncated from 347 to 300 lines): diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out @@ -57,8 +57,8 @@ Ready. [ 5195, "queryhistory", 2000, NULL, 0, true, 0, false, 0 ] [ 5209, "callhistory", 2000, NULL, 0, true, 0, false, 0 ] [ 5226, "querylog", 2000, "create view querylog as\nselect qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id = ql.id;", 1, true, 0, false, 0 ] -[ 5836, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] -[ 5942, "r", 2000, NULL, 0, false, 0, false, 0 ] +[ 5841, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] +[ 5950, "r", 2000, NULL, 0, false, 0, false, 0 ] #select * from tables where name; % .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name % id, name, schema_id, query, type, system, commit_action, readonly, temporary # name @@ -93,8 +93,8 @@ Ready. [ 5195, "queryhistory", 2000, NULL, 0, true, 0, false, 0 ] [ 5209, "callhistory", 2000, NULL, 0, true, 0, false, 0 ] [ 5226, "querylog", 2000, "create view querylog as\nselect qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id = ql.id;", 1, true, 0, false, 0 ] -[ 5836, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] -[ 5942, "r", 2000, NULL, 0, false, 0, false, 0 ] +[ 5841, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] +[ 5950, "r", 2000, NULL, 0, false, 0, false, 0 ] # 18:53:13 > # 18:53:13 > "Done." diff --git a/sql/test/leaks/Tests/check0.stable.out b/sql/test/leaks/Tests/check0.stable.out --- a/sql/test/leaks/Tests/check0.stable.out +++ b/sql/test/leaks/Tests/check0.stable.out @@ -53,18 +53,18 @@ Ready. [ "int", "str", 142 ] [ "oid", "int", 20 ] [ "oid", "int", 20 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] [ "oid", "lng", 20 ] [ "oid", "str", 1 ] [ "oid", "str", 1 ] [ "oid", "str", 20 ] -[ "oid", "str", 3162 ] -[ "oid", "str", 3162 ] +[ "oid", "str", 3168 ] +[ "oid", "str", 3168 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; % .L1, .bbp # table_name % L1, L2 # name 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 @@ -35,8 +35,8 @@ Ready. [ "oid", "bit", 59 ] [ "oid", "bit", 59 ] [ "oid", "bit", 300 ] -[ "oid", "bit", 1146 ] -[ "oid", "bit", 1146 ] +[ "oid", "bit", 1149 ] +[ "oid", "bit", 1149 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -83,15 +83,15 @@ Ready. [ "oid", "int", 300 ] [ "oid", "int", 300 ] [ "oid", "int", 300 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -166,11 +166,11 @@ Ready. [ "oid", "str", 300 ] [ "oid", "str", 300 ] [ "oid", "str", 300 ] -[ "oid", "str", 1146 ] -[ "oid", "str", 1146 ] -[ "oid", "str", 1146 ] -[ "oid", "str", 3162 ] -[ "oid", "str", 3162 ] +[ "oid", "str", 1149 ] +[ "oid", "str", 1149 ] +[ "oid", "str", 1149 ] +[ "oid", "str", 3168 ] +[ "oid", "str", 3168 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] 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 @@ -35,8 +35,8 @@ Ready. [ "oid", "bit", 59 ] [ "oid", "bit", 59 ] [ "oid", "bit", 300 ] -[ "oid", "bit", 1146 ] -[ "oid", "bit", 1146 ] +[ "oid", "bit", 1149 ] +[ "oid", "bit", 1149 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -83,15 +83,15 @@ Ready. [ "oid", "int", 300 ] [ "oid", "int", 300 ] [ "oid", "int", 300 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -166,11 +166,11 @@ Ready. [ "oid", "str", 300 ] [ "oid", "str", 300 ] [ "oid", "str", 300 ] -[ "oid", "str", 1146 ] -[ "oid", "str", 1146 ] -[ "oid", "str", 1146 ] -[ "oid", "str", 3162 ] -[ "oid", "str", 3162 ] +[ "oid", "str", 1149 ] +[ "oid", "str", 1149 ] +[ "oid", "str", 1149 ] +[ "oid", "str", 3168 ] +[ "oid", "str", 3168 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] 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 @@ -35,8 +35,8 @@ Ready. [ "oid", "bit", 60 ] [ "oid", "bit", 60 ] [ "oid", "bit", 302 ] -[ "oid", "bit", 1146 ] -[ "oid", "bit", 1146 ] +[ "oid", "bit", 1149 ] +[ "oid", "bit", 1149 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -83,15 +83,15 @@ Ready. [ "oid", "int", 302 ] [ "oid", "int", 302 ] [ "oid", "int", 302 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -166,11 +166,11 @@ Ready. [ "oid", "str", 302 ] [ "oid", "str", 302 ] [ "oid", "str", 302 ] -[ "oid", "str", 1146 ] -[ "oid", "str", 1146 ] -[ "oid", "str", 1146 ] -[ "oid", "str", 3162 ] -[ "oid", "str", 3162 ] +[ "oid", "str", 1149 ] +[ "oid", "str", 1149 ] +[ "oid", "str", 1149 ] +[ "oid", "str", 3168 ] +[ "oid", "str", 3168 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] 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 @@ -35,8 +35,8 @@ Ready. [ "oid", "bit", 61 ] [ "oid", "bit", 61 ] [ "oid", "bit", 304 ] -[ "oid", "bit", 1146 ] -[ "oid", "bit", 1146 ] +[ "oid", "bit", 1149 ] +[ "oid", "bit", 1149 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -83,15 +83,15 @@ Ready. [ "oid", "int", 304 ] [ "oid", "int", 304 ] [ "oid", "int", 304 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] -[ "oid", "int", 3162 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 1149 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] +[ "oid", "int", 3168 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -166,11 +166,11 @@ Ready. [ "oid", "str", 304 ] [ "oid", "str", 304 ] [ "oid", "str", 304 ] -[ "oid", "str", 1146 ] -[ "oid", "str", 1146 ] -[ "oid", "str", 1146 ] -[ "oid", "str", 3162 ] -[ "oid", "str", 3162 ] +[ "oid", "str", 1149 ] +[ "oid", "str", 1149 ] +[ "oid", "str", 1149 ] +[ "oid", "str", 3168 ] +[ "oid", "str", 3168 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] 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 @@ -35,8 +35,8 @@ Ready. [ "oid", "bit", 61 ] [ "oid", "bit", 61 ] [ "oid", "bit", 304 ] -[ "oid", "bit", 1146 ] -[ "oid", "bit", 1146 ] +[ "oid", "bit", 1149 ] +[ "oid", "bit", 1149 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -83,15 +83,15 @@ Ready. [ "oid", "int", 304 ] [ "oid", "int", 304 ] [ "oid", "int", 304 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 1146 ] -[ "oid", "int", 1146 ] _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
