aftermerge

mysql-test/r/group_by.result

@@ -751,15 +751,6 @@ COUNT(DISTINCT(t1.id))	comment
 1	NULL
 1	a problem
 DROP TABLE t1, t2;
-create table t1(f1 varchar(5) key);
-insert into t1 values (1),(2);
-select sql_buffer_result max(f1) is null from t1;
-max(f1) is null
-0
-select sql_buffer_result max(f1)+1 from t1;
-max(f1)+1
-3
-drop table t1;
 create table t1 (f1 date);
 insert into t1 values('2005-06-06');
 insert into t1 values('2005-06-06');
@@ -775,6 +766,15 @@ n
 Warnings:
 Warning	1052	Column 'n' in group statement is ambiguous
 DROP TABLE t1;
+create table t1(f1 varchar(5) key);
+insert into t1 values (1),(2);
+select sql_buffer_result max(f1) is null from t1;
+max(f1) is null
+0
+select sql_buffer_result max(f1)+1 from t1;
+max(f1)+1
+3
+drop table t1;
 create table t1 (c1 char(3), c2 char(3));
 create table t2 (c3 char(3), c4 char(3));
 insert into t1 values ('aaa', 'bb1'), ('aaa', 'bb2');