Changeset: f15d82151332 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f15d82151332 Modified Files: 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 Feb2013 branch. diffs (truncated from 757 to 300 lines): 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 @@ -45,7 +45,7 @@ Ready. # 16:39:08 > #select s.name as "schema", f.name as "function", a.number as "argno", a.type as "argtype", case a.number when 0 then f.func else '' end as "definition" from sys.functions f, sys.schemas s, sys.args a where s.id = f.schema_id and f.id = a.func_id and f.id in (select * from sys.systemfunctions) order by s.name, f.name, f.id, a.number; -% sys.s, sys.f, sys.a, sys.a, sys. # table_name +% sys.L3, sys.L3, sys.L3, sys.L3, sys.L3 # table_name % schema, function, argno, argtype, definition # name % varchar, varchar, int, varchar, varchar # type % 3, 35, 1, 9, 1582 # length 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 @@ -25,13 +25,20 @@ Ready. # 11:14:41 > mclient -lsql -i -umonetdb -Pmonetdb --host=loki --port=30924 # 11:14:41 > -% sys.types # table_name +# 11:43:05 > +# 11:43:05 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23209" "--port=33225" +# 11:43:05 > + +#set optimizer='sequential_pipe'; +#set trace = 'none'; -- non-documented feature to not get any trace output +#TRACE SELECT count(*) FROM types; +% sys.L1 # table_name % L1 # name % wrd # type % 2 # length [ 29 ] #SELECT COUNT(*) FROM tracelog(); -% . # table_name +% .L1 # table_name % L1 # name % wrd # type % 2 # length 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 @@ -54,28 +54,28 @@ Ready. [ "oid", "int", 8 ] [ "oid", "int", 8 ] [ "oid", "int", 135 ] -[ "oid", "int", 1182 ] -[ "oid", "int", 3217 ] -[ "oid", "int", 3217 ] -[ "oid", "int", 3217 ] -[ "oid", "int", 3217 ] -[ "oid", "int", 3217 ] +[ "oid", "int", 1189 ] +[ "oid", "int", 3234 ] +[ "oid", "int", 3234 ] +[ "oid", "int", 3234 ] +[ "oid", "int", 3234 ] +[ "oid", "int", 3234 ] [ "oid", "lng", 1 ] [ "oid", "lng", 2 ] [ "oid", "str", 1 ] [ "oid", "str", 1 ] [ "oid", "str", 1 ] [ "oid", "str", 135 ] -[ "oid", "str", 3217 ] -[ "oid", "str", 3217 ] +[ "oid", "str", 3234 ] +[ "oid", "str", 3234 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 9, 3 # length -[ "transient", 360 ] +[ "transient", 355 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 10, 2 # length 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 @@ -34,8 +34,8 @@ Ready. [ "oid", "bit", 69 ] [ "oid", "bit", 69 ] [ "oid", "bit", 393 ] -[ "oid", "bit", 1182 ] -[ "oid", "bit", 1182 ] +[ "oid", "bit", 1189 ] +[ "oid", "bit", 1189 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -72,12 +72,12 @@ Ready. [ "oid", "int", 19 ] [ "oid", "int", 19 ] [ "oid", "int", 19 ] -[ "oid", "int", 29 ] -[ "oid", "int", 29 ] -[ "oid", "int", 29 ] -[ "oid", "int", 29 ] -[ "oid", "int", 29 ] -[ "oid", "int", 29 ] +[ "oid", "int", 30 ] +[ "oid", "int", 30 ] +[ "oid", "int", 30 ] +[ "oid", "int", 30 ] +[ "oid", "int", 30 ] +[ "oid", "int", 30 ] [ "oid", "int", 69 ] [ "oid", "int", 69 ] [ "oid", "int", 135 ] @@ -88,15 +88,15 @@ Ready. [ "oid", "int", 393 ] [ "oid", "int", 393 ] [ "oid", "int", 393 ] -[ "oid", "int", 1182 ] -[ "oid", "int", 1182 ] -[ "oid", "int", 1182 ] -[ "oid", "int", 1182 ] -[ "oid", "int", 3217 ] -[ "oid", "int", 3217 ] -[ "oid", "int", 3217 ] -[ "oid", "int", 3217 ] -[ "oid", "int", 3217 ] +[ "oid", "int", 1189 ] +[ "oid", "int", 1189 ] +[ "oid", "int", 1189 ] +[ "oid", "int", 1189 ] +[ "oid", "int", 3234 ] +[ "oid", "int", 3234 ] +[ "oid", "int", 3234 ] +[ "oid", "int", 3234 ] +[ "oid", "int", 3234 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -157,8 +157,8 @@ Ready. [ "oid", "str", 1 ] [ "oid", "str", 2 ] [ "oid", "str", 3 ] -[ "oid", "str", 29 ] -[ "oid", "str", 29 ] +[ "oid", "str", 30 ] +[ "oid", "str", 30 ] [ "oid", "str", 69 ] [ "oid", "str", 69 ] [ "oid", "str", 135 ] @@ -166,19 +166,19 @@ Ready. [ "oid", "str", 393 ] [ "oid", "str", 393 ] [ "oid", "str", 393 ] -[ "oid", "str", 1182 ] -[ "oid", "str", 1182 ] -[ "oid", "str", 1182 ] -[ "oid", "str", 3217 ] -[ "oid", "str", 3217 ] +[ "oid", "str", 1189 ] +[ "oid", "str", 1189 ] +[ "oid", "str", 1189 ] +[ "oid", "str", 3234 ] +[ "oid", "str", 3234 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 9, 3 # length -[ "transient", 176 ] +[ "transient", 170 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 10, 3 # length 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 @@ -34,8 +34,8 @@ Ready. [ "oid", "bit", 69 ] [ "oid", "bit", 69 ] [ "oid", "bit", 393 ] -[ "oid", "bit", 1182 ] -[ "oid", "bit", 1182 ] +[ "oid", "bit", 1189 ] +[ "oid", "bit", 1189 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -72,12 +72,12 @@ Ready. [ "oid", "int", 19 ] [ "oid", "int", 19 ] [ "oid", "int", 19 ] -[ "oid", "int", 29 ] -[ "oid", "int", 29 ] -[ "oid", "int", 29 ] -[ "oid", "int", 29 ] -[ "oid", "int", 29 ] -[ "oid", "int", 29 ] +[ "oid", "int", 30 ] +[ "oid", "int", 30 ] +[ "oid", "int", 30 ] +[ "oid", "int", 30 ] +[ "oid", "int", 30 ] +[ "oid", "int", 30 ] [ "oid", "int", 69 ] [ "oid", "int", 69 ] [ "oid", "int", 135 ] @@ -88,15 +88,15 @@ Ready. [ "oid", "int", 393 ] [ "oid", "int", 393 ] [ "oid", "int", 393 ] -[ "oid", "int", 1182 ] -[ "oid", "int", 1182 ] -[ "oid", "int", 1182 ] -[ "oid", "int", 1182 ] -[ "oid", "int", 3217 ] -[ "oid", "int", 3217 ] -[ "oid", "int", 3217 ] -[ "oid", "int", 3217 ] -[ "oid", "int", 3217 ] +[ "oid", "int", 1189 ] +[ "oid", "int", 1189 ] +[ "oid", "int", 1189 ] +[ "oid", "int", 1189 ] +[ "oid", "int", 3234 ] +[ "oid", "int", 3234 ] +[ "oid", "int", 3234 ] +[ "oid", "int", 3234 ] +[ "oid", "int", 3234 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -157,8 +157,8 @@ Ready. [ "oid", "str", 1 ] [ "oid", "str", 2 ] [ "oid", "str", 3 ] -[ "oid", "str", 29 ] -[ "oid", "str", 29 ] +[ "oid", "str", 30 ] +[ "oid", "str", 30 ] [ "oid", "str", 69 ] [ "oid", "str", 69 ] [ "oid", "str", 135 ] @@ -166,19 +166,19 @@ Ready. [ "oid", "str", 393 ] [ "oid", "str", 393 ] [ "oid", "str", 393 ] -[ "oid", "str", 1182 ] -[ "oid", "str", 1182 ] -[ "oid", "str", 1182 ] -[ "oid", "str", 3217 ] -[ "oid", "str", 3217 ] +[ "oid", "str", 1189 ] +[ "oid", "str", 1189 ] +[ "oid", "str", 1189 ] +[ "oid", "str", 3234 ] +[ "oid", "str", 3234 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 9, 3 # length -[ "transient", 176 ] +[ "transient", 170 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 10, 3 # length diff --git a/sql/test/leaks/Tests/check3_nogeom.stable.out b/sql/test/leaks/Tests/check3_nogeom.stable.out --- a/sql/test/leaks/Tests/check3_nogeom.stable.out +++ b/sql/test/leaks/Tests/check3_nogeom.stable.out @@ -34,8 +34,8 @@ Ready. [ "oid", "bit", 70 ] [ "oid", "bit", 70 ] [ "oid", "bit", 395 ] -[ "oid", "bit", 1182 ] -[ "oid", "bit", 1182 ] +[ "oid", "bit", 1189 ] +[ "oid", "bit", 1189 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -72,12 +72,12 @@ Ready. [ "oid", "int", 19 ] [ "oid", "int", 19 ] [ "oid", "int", 19 ] -[ "oid", "int", 29 ] -[ "oid", "int", 29 ] -[ "oid", "int", 29 ] -[ "oid", "int", 29 ] -[ "oid", "int", 29 ] -[ "oid", "int", 29 ] +[ "oid", "int", 30 ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
