4 files changed, 37 insertions, 24 deletions
diff --git a/mysql-test/r/fulltext2.result b/mysql-test/r/fulltext2.result
index e9bee6f697e..7e3e25370d3 100644
--- a/mysql-test/r/fulltext2.result
+++ b/mysql-test/r/fulltext2.result
@@ -241,18 +241,6 @@ select * from t1 where match a against('ab c' in boolean mode);
 a
 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);
-SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST(0x97C22061616161 IN BOOLEAN MODE);
-HEX(a)
-BEF361616197C22061616161
-DELETE FROM t1 LIMIT 1;
-CHECK TABLE t1;
-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“');
diff --git a/mysql-test/r/fulltext3.result b/mysql-test/r/fulltext3.result
new file mode 100644
index 00000000000..019d5f472ed
--- /dev/null
+++ b/mysql-test/r/fulltext3.result
@@ -0,0 +1,13 @@
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1(a VARCHAR(255) CHARACTER SET gbk, FULLTEXT(a));
+SET NAMES utf8;
+INSERT INTO t1 VALUES(0xF043616161),(0xBEF361616197C22061616161);
+SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST(0x97C22061616161 IN BOOLEAN MODE);
+HEX(a)
+BEF361616197C22061616161
+DELETE FROM t1 LIMIT 1;
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SET NAMES latin1;
+DROP TABLE t1;
diff --git a/mysql-test/t/fulltext2.test b/mysql-test/t/fulltext2.test
index cb2e839c41f..88967a5dd04 100644
--- a/mysql-test/t/fulltext2.test
+++ b/mysql-test/t/fulltext2.test
@@ -220,18 +220,6 @@ select * from t1 where match a against('ab c' in boolean mode);
 drop table t1;
 set names latin1;
 
-#
-# BUG#29299 - repeatable myisam fulltext index corruption
-#
-CREATE TABLE t1(a VARCHAR(255) CHARACTER SET gbk, FULLTEXT(a));
-SET NAMES utf8;
-INSERT INTO t1 VALUES(0xF043616161),(0xBEF361616197C22061616161);
-SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST(0x97C22061616161 IN BOOLEAN MODE);
-DELETE FROM t1 LIMIT 1;
-CHECK TABLE t1;
-SET NAMES latin1;
-DROP TABLE t1;
-
 # End of 4.1 tests
 
 #
diff --git a/mysql-test/t/fulltext3.test b/mysql-test/t/fulltext3.test
new file mode 100644
index 00000000000..5ca068c066b
--- /dev/null
+++ b/mysql-test/t/fulltext3.test
@@ -0,0 +1,24 @@
+--source include/have_gbk.inc
+#
+# test of new fulltext search features
+#
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+
+#
+# BUG#29299 - repeatable myisam fulltext index corruption
+#
+CREATE TABLE t1(a VARCHAR(255) CHARACTER SET gbk, FULLTEXT(a));
+SET NAMES utf8;
+INSERT INTO t1 VALUES(0xF043616161),(0xBEF361616197C22061616161);
+SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST(0x97C22061616161 IN BOOLEAN MODE);
+DELETE FROM t1 LIMIT 1;
+CHECK TABLE t1;
+SET NAMES latin1;
+DROP TABLE t1;
+
+# End of 4.1 tests
+