Changeset: 8310880836c6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8310880836c6
Modified Files:
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
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/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 from Feb2013 branch.
diffs (211 lines):
diff --git
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
---
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
+++
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
@@ -39,7 +39,7 @@ Ready.
% mal # name
% clob # type
% 63 # length
-function user.s4_1{autoCommit=true}():void;
+function user.s2_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c2",0);
X_8:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c2",2);
@@ -71,7 +71,7 @@ function user.s4_1{autoCommit=true}():vo
sql.rsColumn(X_44,"sys.t2564","L1","wrd",32,0,X_42);
X_49 := io.stdout();
sql.exportResult(X_49,X_44);
-end s4_1;
+end s2_1;
#select count(*) from t2564 group by c1, c2, c3;
% sys.t2564 # table_name
% L1 # name
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
@@ -71,13 +71,13 @@ Ready.
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 9, 3 # length
[ "transient", 598 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 10, 2 # length
[ "persistent", 20 ]
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
@@ -194,13 +194,13 @@ Ready.
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 9, 3 # length
[ "transient", 170 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 10, 3 # length
[ "persistent", 163 ]
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
@@ -194,13 +194,13 @@ Ready.
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 9, 3 # length
[ "transient", 170 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 10, 3 # length
[ "persistent", 163 ]
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
@@ -194,13 +194,13 @@ Ready.
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 9, 3 # length
[ "transient", 190 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 10, 3 # length
[ "persistent", 163 ]
diff --git a/sql/test/leaks/Tests/check4_nogeom.stable.out
b/sql/test/leaks/Tests/check4_nogeom.stable.out
--- a/sql/test/leaks/Tests/check4_nogeom.stable.out
+++ b/sql/test/leaks/Tests/check4_nogeom.stable.out
@@ -194,13 +194,13 @@ Ready.
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 9, 3 # length
[ "transient", 190 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 10, 3 # length
[ "persistent", 163 ]
diff --git a/sql/test/leaks/Tests/check5_nogeom.stable.out
b/sql/test/leaks/Tests/check5_nogeom.stable.out
--- a/sql/test/leaks/Tests/check5_nogeom.stable.out
+++ b/sql/test/leaks/Tests/check5_nogeom.stable.out
@@ -194,13 +194,13 @@ Ready.
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 9, 3 # length
[ "transient", 190 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 10, 3 # length
[ "persistent", 163 ]
diff --git a/sql/test/leaks/Tests/drop3_nogeom.stable.out
b/sql/test/leaks/Tests/drop3_nogeom.stable.out
--- a/sql/test/leaks/Tests/drop3_nogeom.stable.out
+++ b/sql/test/leaks/Tests/drop3_nogeom.stable.out
@@ -26,13 +26,13 @@ Ready.
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 9, 3 # length
[ "transient", 181 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 10, 3 # length
[ "persistent", 166 ]
diff --git a/sql/test/leaks/Tests/temp1_nogeom.stable.out
b/sql/test/leaks/Tests/temp1_nogeom.stable.out
--- a/sql/test/leaks/Tests/temp1_nogeom.stable.out
+++ b/sql/test/leaks/Tests/temp1_nogeom.stable.out
@@ -26,13 +26,13 @@ Ready.
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 9, 3 # length
[ "transient", 164 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 10, 3 # length
[ "persistent", 163 ]
diff --git a/sql/test/leaks/Tests/temp2_nogeom.stable.out
b/sql/test/leaks/Tests/temp2_nogeom.stable.out
--- a/sql/test/leaks/Tests/temp2_nogeom.stable.out
+++ b/sql/test/leaks/Tests/temp2_nogeom.stable.out
@@ -26,13 +26,13 @@ Ready.
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 9, 3 # length
[ "transient", 164 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 10, 3 # length
[ "persistent", 163 ]
diff --git a/sql/test/leaks/Tests/temp3_nogeom.stable.out
b/sql/test/leaks/Tests/temp3_nogeom.stable.out
--- a/sql/test/leaks/Tests/temp3_nogeom.stable.out
+++ b/sql/test/leaks/Tests/temp3_nogeom.stable.out
@@ -26,13 +26,13 @@ Ready.
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 9, 3 # length
[ "transient", 189 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .bbp # table_name
% L1, L2 # name
-% char, wrd # type
+% varchar, wrd # type
% 10, 3 # length
[ "persistent", 163 ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
