ctype_utf8.result:

  After merge fix.


mysql-test/r/ctype_utf8.result:
  After merge fix.

mysql-test/r/ctype_utf8.result

@@ -1049,6 +1049,15 @@ create table t1 (a varchar(255)) default charset=utf8;
 select * from t1 where find_in_set('-1', a);
 a
 drop table t1;
+create table t1 (a int);
+insert into t1 values (48),(49),(50);
+set names utf8;
+select distinct char(a) from t1;
+char(a)
+0
+1
+2
+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;
@@ -1148,12 +1157,3 @@ set @a:=null;
 execute my_stmt using @a;
 a	b
 drop table if exists t1;
-create table t1 (a int);
-insert into t1 values (48),(49),(50);
-set names utf8;
-select distinct char(a) from t1;
-char(a)
-0
-1
-2
-drop table t1;