ctype_utf8.result:

  after merge fix
  ,


mysql-test/r/ctype_utf8.result:
  after merge fix
  ,

mysql-test/r/ctype_utf8.result

@@ -1044,6 +1044,11 @@ hex(a)
 5B
 E880BD
 drop table t1;
+set names 'latin1';
+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(id varchar(20) NOT NULL) DEFAULT CHARSET=utf8;
 INSERT INTO t1 VALUES ('xxx'), ('aa'), ('yyy'), ('aa');
 SELECT id FROM t1;
@@ -1126,8 +1131,3 @@ a
 i
 い
 drop table t1,t2;
-set names 'latin1';
-create table t1 (a varchar(255)) default charset=utf8;
-select * from t1 where find_in_set('-1', a);
-a
-drop table t1;