Changeset: ec7e83e63973 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec7e83e63973 Modified Files: sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out sql/test/Tests/systemfunctions_nogeom.stable.out sql/test/Tests/trace_nogeom.stable.out sql/test/leaks/Tests/check0_nogeom.stable.out sql/test/leaks/Tests/check1_nogeom.stable.out sql/test/leaks/Tests/check2_nogeom.stable.out sql/test/leaks/Tests/check3_nogeom.stable.out sql/test/leaks/Tests/check4_nogeom.stable.out sql/test/leaks/Tests/check5_nogeom.stable.out sql/test/leaks/Tests/drop3_nogeom.stable.out sql/test/leaks/Tests/select1_nogeom.stable.out sql/test/leaks/Tests/select2_nogeom.stable.out sql/test/leaks/Tests/temp1_nogeom.stable.out sql/test/leaks/Tests/temp2_nogeom.stable.out sql/test/leaks/Tests/temp3_nogeom.stable.out Branch: default Log Message:
Merge with Oct2012 branch. diffs (truncated from 977 to 300 lines): diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err @@ -30,7 +30,7 @@ stderr of test 'predicate_select.Bug-309 # 18:53:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels" "--port=32323" # 18:53:13 > -MAPI = monetdb@sofia:39129 +MAPI = monetdb@madrid:32839 QUERY = select * from tables where name; ERROR = !conversion from string to type bit failed. diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.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 ] -[ 5641, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] -[ 5750, "r", 2000, NULL, 0, false, 0, false, 0 ] +[ 5632, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] +[ 5741, "r", 2000, NULL, 0, false, 0, false, 0 ] # 18:53:13 > # 18:53:13 > "Done." diff --git a/sql/test/Tests/systemfunctions_nogeom.stable.out b/sql/test/Tests/systemfunctions_nogeom.stable.out --- a/sql/test/Tests/systemfunctions_nogeom.stable.out +++ b/sql/test/Tests/systemfunctions_nogeom.stable.out @@ -263,11 +263,6 @@ Ready. [ "sys", "zorder_encode", 0, "oid", "-- The contents of this file are subject to the MonetDB Public License\n-- Version 1.1 (the \"License\"); you may not use this file except in\n-- compliance with the License. You may obtain a copy of the License at\n-- http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software distributed under the License is distributed on an \"AS IS\"\n-- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the\n-- License for the specific language governing rights and limitations\n-- under the License.\n--\n-- The Original Code is the MonetDB Database System.\n--\n-- The Initial Developer of the Original Code is CWI.\n-- Copyright August 2008-2012 MonetDB B.V.\n-- All Rights Reserved.\n\ncreate function zorder_encode(x integer, y integer) returns oid\n external name zorder.encode;" ] [ "sys", "zorder_encode", 1, "int", "" ] [ "sys", "zorder_encode", 2, "int", "" ] -[ "sys", "zorder_slice", 0, "table", "create function zorder_slice(xb integer, yb integer, xt integer, yt integer) returns table (z oid)\n external name zorder.sql_slice;" ] -[ "sys", "zorder_slice", 1, "int", "" ] -[ "sys", "zorder_slice", 2, "int", "" ] -[ "sys", "zorder_slice", 3, "int", "" ] -[ "sys", "zorder_slice", 4, "int", "" ] # 16:39:08 > # 16:39:08 > "Done." diff --git a/sql/test/Tests/trace_nogeom.stable.out b/sql/test/Tests/trace_nogeom.stable.out --- a/sql/test/Tests/trace_nogeom.stable.out +++ b/sql/test/Tests/trace_nogeom.stable.out @@ -35,7 +35,7 @@ Ready. % L1 # name % wrd # type % 2 # length -[ 17 ] +[ 15 ] # 11:14:41 > # 11:14:41 > Done. diff --git a/sql/test/leaks/Tests/check0_nogeom.stable.out b/sql/test/leaks/Tests/check0_nogeom.stable.out --- a/sql/test/leaks/Tests/check0_nogeom.stable.out +++ b/sql/test/leaks/Tests/check0_nogeom.stable.out @@ -48,23 +48,26 @@ Ready. % htype, ttype, count # name % clob, clob, bigint # type % 3, 3, 4 # length -[ "int", "int", 8 ] -[ "int", "lng", 2 ] -[ "int", "str", 142 ] -[ "oid", "int", 20 ] -[ "oid", "int", 20 ] -[ "oid", "int", 1109 ] -[ "oid", "int", 3061 ] -[ "oid", "int", 3061 ] -[ "oid", "int", 3061 ] -[ "oid", "int", 3061 ] -[ "oid", "int", 3061 ] -[ "oid", "lng", 20 ] +[ "oid", "int", 1 ] +[ "oid", "int", 1 ] +[ "oid", "int", 2 ] +[ "oid", "int", 8 ] +[ "oid", "int", 8 ] +[ "oid", "int", 144 ] +[ "oid", "int", 1108 ] +[ "oid", "int", 3056 ] +[ "oid", "int", 3056 ] +[ "oid", "int", 3056 ] +[ "oid", "int", 3056 ] +[ "oid", "int", 3056 ] +[ "oid", "lng", 1 ] +[ "oid", "lng", 2 ] [ "oid", "str", 1 ] [ "oid", "str", 1 ] -[ "oid", "str", 20 ] -[ "oid", "str", 3061 ] -[ "oid", "str", 3061 ] +[ "oid", "str", 1 ] +[ "oid", "str", 144 ] +[ "oid", "str", 3056 ] +[ "oid", "str", 3056 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; % .L1, .bbp # table_name % L1, L2 # name @@ -76,7 +79,7 @@ Ready. % L1, L2 # name % char, wrd # type % 10, 2 # length -[ "persistent", 17 ] +[ "persistent", 20 ] # 22:02:15 > # 22:02:15 > Done. diff --git a/sql/test/leaks/Tests/check1_nogeom.stable.out b/sql/test/leaks/Tests/check1_nogeom.stable.out --- a/sql/test/leaks/Tests/check1_nogeom.stable.out +++ b/sql/test/leaks/Tests/check1_nogeom.stable.out @@ -28,15 +28,14 @@ Ready. % htype, ttype, count # name % clob, clob, bigint # type % 3, 9, 4 # length -[ "int", "int", 0 ] -[ "int", "lng", 2 ] -[ "int", "str", 142 ] [ "oid", "bit", 0 ] -[ "oid", "bit", 59 ] -[ "oid", "bit", 59 ] -[ "oid", "bit", 300 ] -[ "oid", "bit", 1109 ] -[ "oid", "bit", 1109 ] +[ "oid", "bit", 58 ] +[ "oid", "bit", 58 ] +[ "oid", "bit", 299 ] +[ "oid", "bit", 1108 ] +[ "oid", "bit", 1108 ] +[ "oid", "int", 0 ] +[ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -46,6 +45,9 @@ Ready. [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 1 ] +[ "oid", "int", 1 ] +[ "oid", "int", 1 ] +[ "oid", "int", 2 ] [ "oid", "int", 2 ] [ "oid", "int", 2 ] [ "oid", "int", 2 ] @@ -61,8 +63,6 @@ Ready. [ "oid", "int", 3 ] [ "oid", "int", 4 ] [ "oid", "int", 4 ] -[ "oid", "int", 5 ] -[ "oid", "int", 5 ] [ "oid", "int", 19 ] [ "oid", "int", 19 ] [ "oid", "int", 19 ] @@ -74,24 +74,25 @@ Ready. [ "oid", "int", 29 ] [ "oid", "int", 29 ] [ "oid", "int", 29 ] -[ "oid", "int", 59 ] -[ "oid", "int", 59 ] +[ "oid", "int", 58 ] +[ "oid", "int", 58 ] +[ "oid", "int", 144 ] [ "oid", "int", 195 ] [ "oid", "int", 195 ] -[ "oid", "int", 300 ] -[ "oid", "int", 300 ] -[ "oid", "int", 300 ] -[ "oid", "int", 300 ] -[ "oid", "int", 300 ] -[ "oid", "int", 1109 ] -[ "oid", "int", 1109 ] -[ "oid", "int", 1109 ] -[ "oid", "int", 1109 ] -[ "oid", "int", 3061 ] -[ "oid", "int", 3061 ] -[ "oid", "int", 3061 ] -[ "oid", "int", 3061 ] -[ "oid", "int", 3061 ] +[ "oid", "int", 299 ] +[ "oid", "int", 299 ] +[ "oid", "int", 299 ] +[ "oid", "int", 299 ] +[ "oid", "int", 299 ] +[ "oid", "int", 1108 ] +[ "oid", "int", 1108 ] +[ "oid", "int", 1108 ] +[ "oid", "int", 1108 ] +[ "oid", "int", 3056 ] +[ "oid", "int", 3056 ] +[ "oid", "int", 3056 ] +[ "oid", "int", 3056 ] +[ "oid", "int", 3056 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -105,7 +106,8 @@ Ready. [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] -[ "oid", "lng", 5 ] +[ "oid", "lng", 1 ] +[ "oid", "lng", 2 ] [ "oid", "oid", 0 ] [ "oid", "oid", 0 ] [ "oid", "oid", 0 ] @@ -130,8 +132,8 @@ Ready. [ "oid", "sht", 0 ] [ "oid", "sht", 0 ] [ "oid", "sht", 0 ] -[ "oid", "sht", 59 ] -[ "oid", "sht", 59 ] +[ "oid", "sht", 58 ] +[ "oid", "sht", 58 ] [ "oid", "sht", 195 ] [ "oid", "str", 0 ] [ "oid", "str", 0 ] @@ -152,25 +154,26 @@ Ready. [ "oid", "str", 1 ] [ "oid", "str", 1 ] [ "oid", "str", 1 ] +[ "oid", "str", 1 ] [ "oid", "str", 2 ] [ "oid", "str", 2 ] [ "oid", "str", 2 ] [ "oid", "str", 3 ] [ "oid", "str", 4 ] -[ "oid", "str", 5 ] [ "oid", "str", 29 ] [ "oid", "str", 29 ] -[ "oid", "str", 59 ] -[ "oid", "str", 59 ] -[ "oid", "str", 300 ] -[ "oid", "str", 300 ] -[ "oid", "str", 300 ] -[ "oid", "str", 300 ] -[ "oid", "str", 1109 ] -[ "oid", "str", 1109 ] -[ "oid", "str", 1109 ] -[ "oid", "str", 3061 ] -[ "oid", "str", 3061 ] +[ "oid", "str", 58 ] +[ "oid", "str", 58 ] +[ "oid", "str", 144 ] +[ "oid", "str", 299 ] +[ "oid", "str", 299 ] +[ "oid", "str", 299 ] +[ "oid", "str", 299 ] +[ "oid", "str", 1108 ] +[ "oid", "str", 1108 ] +[ "oid", "str", 1108 ] +[ "oid", "str", 3056 ] +[ "oid", "str", 3056 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] @@ -188,7 +191,7 @@ Ready. % L1, L2 # name % char, wrd # type % 10, 3 # length -[ "persistent", 149 ] +[ "persistent", 152 ] # 22:02:15 > # 22:02:15 > Done. diff --git a/sql/test/leaks/Tests/check2_nogeom.stable.out b/sql/test/leaks/Tests/check2_nogeom.stable.out --- a/sql/test/leaks/Tests/check2_nogeom.stable.out +++ b/sql/test/leaks/Tests/check2_nogeom.stable.out @@ -28,15 +28,14 @@ Ready. % htype, ttype, count # name % clob, clob, bigint # type % 3, 9, 4 # length -[ "int", "int", 0 ] -[ "int", "lng", 2 ] -[ "int", "str", 142 ] [ "oid", "bit", 0 ] -[ "oid", "bit", 59 ] -[ "oid", "bit", 59 ] -[ "oid", "bit", 300 ] -[ "oid", "bit", 1109 ] -[ "oid", "bit", 1109 ] +[ "oid", "bit", 58 ] +[ "oid", "bit", 58 ] +[ "oid", "bit", 299 ] +[ "oid", "bit", 1108 ] +[ "oid", "bit", 1108 ] +[ "oid", "int", 0 ] +[ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -46,6 +45,9 @@ Ready. [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 1 ] +[ "oid", "int", 1 ] +[ "oid", "int", 1 ] +[ "oid", "int", 2 ] [ "oid", "int", 2 ] [ "oid", "int", 2 ] [ "oid", "int", 2 ] @@ -61,8 +63,6 @@ Ready. _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
