Merge mysql.com:/home/hf/work/mysql-5.0-0mrg

into  mysql.com:/home/hf/work/mysql-5.1-mrg

1 files changed, 7 insertions, 7 deletions

diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result
index 577c831057e..e5cc47fd9d2 100644
--- a/mysql-test/r/order_by.result
+++ b/mysql-test/r/order_by.result
@@ -760,13 +760,6 @@ xxxxxxxxxxxxxxxxxxxaa
 xxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxz
 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);
-a	b
-1	2
-1	1
-drop table t1;
 create table t1 (
 `sid` decimal(8,0) default null,
 `wnid` varchar(11) not null default '',
@@ -881,6 +874,13 @@ num	(select num + 2 FROM t1 LIMIT 1)
 SELECT a.a + 1 AS num FROM t1 a JOIN t1 b ON num = b.a;
 ERROR 42S22: Unknown column 'num' in 'on clause'
 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);
+a	b
+1	2
+1	1
+drop table t1;
 CREATE TABLE t1 (a int, b int, PRIMARY KEY  (a));
 INSERT INTO t1 VALUES (1,1), (2,2), (3,3);
 explain SELECT t1.b as a, t2.b as c FROM