Post-merge fixes

1 files changed, 6 insertions, 6 deletions

diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test
index 4631fad3352..df5535386a5 100644
--- a/mysql-test/t/group_by.test
+++ b/mysql-test/t/group_by.test
@@ -575,6 +575,12 @@ CREATE TABLE t1 (id varchar(20) NOT NULL);
 INSERT INTO t1 VALUES ('trans1'), ('trans2');
 CREATE TABLE t2 (id varchar(20) NOT NULL, err_comment blob NOT NULL);
 INSERT INTO t2 VALUES ('trans1', 'a problem');
+
+SELECT COUNT(DISTINCT(t1.id)), LEFT(err_comment, 256) AS comment
+  FROM t1 LEFT JOIN t2 ON t1.id=t2.id GROUP BY comment;
+
+DROP TABLE t1, t2;
+
 #
 # BUG#12695: Item_func_isnull::update_used_tables
 # did not update const_item_cache
@@ -585,12 +591,6 @@ select sql_buffer_result max(f1) is null from t1;
 select sql_buffer_result max(f1)+1 from t1;
 drop table t1;
 
-SELECT COUNT(DISTINCT(t1.id)), LEFT(err_comment, 256) AS comment
-  FROM t1 LEFT JOIN t2 ON t1.id=t2.id GROUP BY comment;
-
-DROP TABLE t1, t2;
-
-
 #
 # Bug #12266 GROUP BY expression on DATE column produces result with
 #            reduced length