fix bad merge

mysql-test/r/fulltext2.result

@@ -241,14 +241,6 @@ select * from t1 where match a against('ab c' in boolean mode);
 a
 drop table t1;
 set names latin1;
-SET NAMES utf8;
-CREATE TABLE t1(a VARCHAR(255), FULLTEXT(a)) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-INSERT INTO t1 VALUES('„MySQL“');
-SELECT a FROM t1 WHERE MATCH a AGAINST('“MySQL„' IN BOOLEAN MODE);
-a
-„MySQL“
-DROP TABLE t1;
-SET NAMES latin1;
 CREATE TABLE t1(a VARCHAR(255) CHARACTER SET gbk, FULLTEXT(a));
 SET NAMES utf8;
 INSERT INTO t1 VALUES(0xF043616161),(0xBEF361616197C22061616161);
@@ -261,3 +253,11 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 SET NAMES latin1;
 DROP TABLE t1;
+SET NAMES utf8;
+CREATE TABLE t1(a VARCHAR(255), FULLTEXT(a)) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+INSERT INTO t1 VALUES('„MySQL“');
+SELECT a FROM t1 WHERE MATCH a AGAINST('“MySQL„' IN BOOLEAN MODE);
+a
+„MySQL“
+DROP TABLE t1;
+SET NAMES latin1;