summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <svoj@mysql.com/april.(none)>2007-07-13 03:29:25 +0500
committerunknown <svoj@mysql.com/april.(none)>2007-07-13 03:29:25 +0500
commitbae6562762e8a35793faf5c2708b1401f81f81fe (patch)
tree176db9f50a7769b4e326467c9f102cb5fdcd493d
parent62738bf97e7a653030361f0dcedf0f4a5c97388d (diff)
downloadmariadb-git-bae6562762e8a35793faf5c2708b1401f81f81fe.tar.gz
BUG#29464 - load data infile into table with big5 chinese fulltext index
hangs 100% cpu Moved a test case for BUG#29464 into fulltext3.test, since it requires big5 character set. mysql-test/r/fulltext.result: Moved a test case for BUG#29464 into fulltext3.test, since it requires big5 character set. mysql-test/r/fulltext3.result: Moved a test case for BUG#29464 into fulltext3.test, since it requires big5 character set. mysql-test/t/fulltext.test: Moved a test case for BUG#29464 into fulltext3.test, since it requires big5 character set. mysql-test/t/fulltext3.test: Moved a test case for BUG#29464 into fulltext3.test, since it requires big5 character set.
-rw-r--r--mysql-test/r/fulltext.result4
-rw-r--r--mysql-test/r/fulltext3.result4
-rw-r--r--mysql-test/t/fulltext.test9
-rw-r--r--mysql-test/t/fulltext3.test10
4 files changed, 14 insertions, 13 deletions
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index a649f70b6f2..96ebb9bf254 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -476,10 +476,6 @@ ALTER TABLE t1 DISABLE KEYS;
SELECT * FROM t1 WHERE MATCH(a) AGAINST('test');
ERROR HY000: Can't find FULLTEXT index matching the column list
DROP TABLE t1;
-CREATE TABLE t1(a VARCHAR(2) CHARACTER SET big5 COLLATE big5_chinese_ci,
-FULLTEXT(a));
-INSERT INTO t1 VALUES(0xA3C2);
-DROP TABLE t1;
CREATE TABLE t1(a VARCHAR(20), FULLTEXT(a));
INSERT INTO t1 VALUES('Offside'),('City Of God');
SELECT a FROM t1 WHERE MATCH a AGAINST ('+city of*' IN BOOLEAN MODE);
diff --git a/mysql-test/r/fulltext3.result b/mysql-test/r/fulltext3.result
index 019d5f472ed..4ec48369ad1 100644
--- a/mysql-test/r/fulltext3.result
+++ b/mysql-test/r/fulltext3.result
@@ -11,3 +11,7 @@ Table Op Msg_type Msg_text
test.t1 check status OK
SET NAMES latin1;
DROP TABLE t1;
+CREATE TABLE t1(a VARCHAR(2) CHARACTER SET big5 COLLATE big5_chinese_ci,
+FULLTEXT(a));
+INSERT INTO t1 VALUES(0xA3C2);
+DROP TABLE t1;
diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test
index ecb4a0e5691..1f8a3b82cfd 100644
--- a/mysql-test/t/fulltext.test
+++ b/mysql-test/t/fulltext.test
@@ -400,15 +400,6 @@ SELECT * FROM t1 WHERE MATCH(a) AGAINST('test');
DROP TABLE t1;
#
-# BUG#29464 - load data infile into table with big5 chinese fulltext index
-# hangs 100% cpu
-#
-CREATE TABLE t1(a VARCHAR(2) CHARACTER SET big5 COLLATE big5_chinese_ci,
-FULLTEXT(a));
-INSERT INTO t1 VALUES(0xA3C2);
-DROP TABLE t1;
-
-#
# BUG#29445 - match ... against () never returns
#
CREATE TABLE t1(a VARCHAR(20), FULLTEXT(a));
diff --git a/mysql-test/t/fulltext3.test b/mysql-test/t/fulltext3.test
index a57fd48daaa..1b6a07c540f 100644
--- a/mysql-test/t/fulltext3.test
+++ b/mysql-test/t/fulltext3.test
@@ -22,3 +22,13 @@ DROP TABLE t1;
# End of 5.0 tests
+#
+# BUG#29464 - load data infile into table with big5 chinese fulltext index
+# hangs 100% cpu
+#
+CREATE TABLE t1(a VARCHAR(2) CHARACTER SET big5 COLLATE big5_chinese_ci,
+FULLTEXT(a));
+INSERT INTO t1 VALUES(0xA3C2);
+DROP TABLE t1;
+
+# End of 5.1 tests