Changeset: eb134997e09e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb134997e09e
Modified Files:
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (58 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
@@ -62,12 +62,12 @@ function user.s2_1{autoCommit=true}():vo
(X_36,r1_42,r2_42) := group.subgroupdone(X_15,X_33);
X_39:bat[:oid,:wrd] := aggr.subcount(X_36,X_36,r1_42,false);
X_42 := sql.resultSet(1,1,X_39);
- sql.rsColumn(X_42,"sys.t2564","L1","wrd",32,0,X_39);
+ sql.rsColumn(X_42,"sys.L1","L1","wrd",32,0,X_39);
X_49 := io.stdout();
sql.exportResult(X_49,X_42);
end s2_1;
#select count(*) from t2564 group by c1, c2, c3;
-% sys.t2564 # table_name
+% sys.L1 # table_name
% L1 # name
% wrd # type
% 1 # length
diff --git
a/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
b/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
---
a/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
+++
b/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
@@ -27,11 +27,11 @@ Ready.
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, str, str, str # type
-% 3, 3, 1, 0, 0, 2 # length
-[ "wrd", 32, 0, "", "", "L1" ]
+% 3, 3, 1, 0, 2, 2 # length
+[ "wrd", 32, 0, "", "L1", "L1" ]
[ "wrd", 32, 0, NULL, NULL, NULL ]
-#exec 1(1);
-% ._tables # table_name
+#exec 0(1);
+% .L1 # table_name
% L1 # name
% wrd # type
% 1 # length
diff --git
a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
@@ -41,7 +41,7 @@ Ready.
| | | | ) [ ] [ sys.count() NOT NULL as L1 ]
|
| | | ) [ L1 ]
|
| | ) [ ] [ sys.sum no nil (L1) as L1 ]
|
-| ) [ L1 NOT NULL ]
|
+| ) [ L1 NOT NULL as L1.L1 ]
|
+--------------------------------------------------------------------------------------+
20 rows
@@ -79,7 +79,7 @@ Operation successful
| X_41 := bat.append(X_26,X_40,true); |
| X_43 := algebra.selectNotNil(X_41); |
| X_44:wrd := aggr.sum(X_43); |
-| sql.exportValue(1,".tables","L1","wrd",32,0,6,X_44,""); |
+| sql.exportValue(1,".L1","L1","wrd",32,0,6,X_44,""); |
| end s1_1; |
| # querylog.define("explain select count(*) from tables;","default_pipe") |
+--------------------------------------------------------------------------+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
