ctype_utf8.result:

  After merge fix:
  fixing order of results.


mysql-test/r/ctype_utf8.result:
  After merge fix:
  fixing order of results.

mysql-test/r/ctype_utf8.result

@@ -1058,6 +1058,14 @@ char(a)
 1
 2
 drop table t1;
+CREATE TABLE t1 (t TINYTEXT CHARACTER SET utf8);
+INSERT INTO t1 VALUES(REPEAT('a', 100));
+CREATE TEMPORARY TABLE t2 SELECT COALESCE(t) AS bug FROM t1;
+SELECT LENGTH(bug) FROM t2;
+LENGTH(bug)
+100
+DROP TABLE t2;
+DROP TABLE t1;
 CREATE TABLE t1(id varchar(20) NOT NULL) DEFAULT CHARSET=utf8;
 INSERT INTO t1 VALUES ('xxx'), ('aa'), ('yyy'), ('aa');
 SELECT id FROM t1;
@@ -1167,11 +1175,3 @@ set @a:=null;
 execute my_stmt using @a;
 a	b
 drop table if exists t1;
-CREATE TABLE t1 (t TINYTEXT CHARACTER SET utf8);
-INSERT INTO t1 VALUES(REPEAT('a', 100));
-CREATE TEMPORARY TABLE t2 SELECT COALESCE(t) AS bug FROM t1;
-SELECT LENGTH(bug) FROM t2;
-LENGTH(bug)
-100
-DROP TABLE t2;
-DROP TABLE t1;