MonetDB: jacqueline - Merged from default

[Fabian Groffen]

Changeset: c2aa18da2f46 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c2aa18da2f46
Modified Files:
        
Branch: jacqueline
Log Message:

Merged from default


diffs (27 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
@@ -70,7 +70,7 @@ function user.s4_1{autoCommit=true}():vo
     X_42 := bat.mirror(ext59);
     X_43:bat[:oid,:wrd]  := aggr.count(grp57,grp57,X_42);
     X_44 := sql.resultSet(1,1,X_43);
-    sql.rsColumn(X_44,"sys.t2564","L4":str,"wrd",32,0,X_43);
+    sql.rsColumn(X_44,"sys.t2564","L1":str,"wrd",32,0,X_43);
     X_52 := io.stdout();
     sql.exportResult(X_52,X_44);
 end s4_1;
diff --git 
a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Windows
 
b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Windows
--- 
a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Windows
+++ 
b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Windows
@@ -38,9 +38,9 @@ Ready.
 1 row
 
 +--------------------------+
-| single_value                                                                 
                                                    |
+| single_value             |
 +==========================+
-| SAVE 25¢ ON ICE CREAM                                                       
                                                     |
+| SAVE 25¢ ON ICE CREAM    |
 +--------------------------+
 1 row
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list