Fix after manual merge

a87e5ac3 · igor@olga.mysql.com · 6aa599fc · a87e5ac3
Commit a87e5ac3 authored Apr 03, 2007 by igor@olga.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/r/order_by.result mysql-test/r/order_by.result +2 -2

No files found.
--- a/mysql-test/r/order_by.result
+++ b/mysql-test/r/order_by.result
@@ -963,8 +963,8 @@ x1	x2
 	3
 	4
 1	
-2
+2	
-DROP TABLE t1;	
+DROP TABLE t1;
 create table t1 (a int not null, b  int not null, c int not null);
 insert t1 values (1,1,1),(1,1,2),(1,2,1);
 select a, b from t1 group by a, b order by sum(c);