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

Merge with Aug2011 branch.


diffs (44 lines):

diff --git a/sql/test/BugTracker-2011/Tests/groupby_primary_key.Bug-2807.sql 
b/sql/test/BugTracker-2011/Tests/groupby_primary_key.Bug-2807.sql
--- a/sql/test/BugTracker-2011/Tests/groupby_primary_key.Bug-2807.sql
+++ b/sql/test/BugTracker-2011/Tests/groupby_primary_key.Bug-2807.sql
@@ -43,13 +43,15 @@ select b.name, c.id, c.name from facts l
                on b_id = b.id 
                left join c 
                on c_id = c.id 
-group by b.name, c.name, c.id;
+group by b.name, c.name, c.id
+order by b.name, c.id, c.name;
 
 alter table c drop constraint c_id_pkey;
 
 -- produces correct result:
 select b.name, c.id, c.name from facts left join a on a_id = a.id left join b
-on b_id = b.id left join c on c_id = c.id group by b.name, c.name, c.id;
+on b_id = b.id left join c on c_id = c.id group by b.name, c.name, c.id
+order by b.name, c.id, c.name;
 
 drop table facts;
 drop table a;
diff --git 
a/sql/test/BugTracker-2011/Tests/groupby_primary_key.Bug-2807.stable.out 
b/sql/test/BugTracker-2011/Tests/groupby_primary_key.Bug-2807.stable.out
--- a/sql/test/BugTracker-2011/Tests/groupby_primary_key.Bug-2807.stable.out
+++ b/sql/test/BugTracker-2011/Tests/groupby_primary_key.Bug-2807.stable.out
@@ -102,8 +102,8 @@ Over..
 % 2,   1,      2 # length
 [ "b1",        1,      "c1"    ]
 [ "b1",        2,      "c2"    ]
+[ "b1",        3,      "c3"    ]
 [ "b2",        1,      "c1"    ]
-[ "b1",        3,      "c3"    ]
 [ "b2",        2,      "c2"    ]
 [ "b2",        3,      "c3"    ]
 [ "b3",        1,      "c1"    ]
@@ -118,8 +118,8 @@ Over..
 % 2,   1,      2 # length
 [ "b1",        1,      "c1"    ]
 [ "b1",        2,      "c2"    ]
+[ "b1",        3,      "c3"    ]
 [ "b2",        1,      "c1"    ]
-[ "b1",        3,      "c3"    ]
 [ "b2",        2,      "c2"    ]
 [ "b2",        3,      "c3"    ]
 [ "b3",        1,      "c1"    ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to