bk commit into 5.1 tree (svoj:1.2545) BUG#29464

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.1 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-13 03:29:25+05:00, svoj@stripped +4 -0
  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@stripped, 2007-07-13 03:29:22+05:00, svoj@stripped +0 -4
    Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
    character set.

  mysql-test/r/fulltext3.result@stripped, 2007-07-13 03:29:22+05:00, svoj@stripped +4 -0
    Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
    character set.

  mysql-test/t/fulltext.test@stripped, 2007-07-13 03:29:22+05:00, svoj@stripped +0 -9
    Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
    character set.

  mysql-test/t/fulltext3.test@stripped, 2007-07-13 03:29:22+05:00, svoj@stripped +10 -0
    Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
    character set.

diff -Nrup a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
--- a/mysql-test/r/fulltext.result	2007-07-13 03:25:24 +05:00
+++ b/mysql-test/r/fulltext.result	2007-07-13 03:29:22 +05:00
@@ -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 -Nrup a/mysql-test/r/fulltext3.result b/mysql-test/r/fulltext3.result
--- a/mysql-test/r/fulltext3.result	2007-07-06 23:35:02 +05:00
+++ b/mysql-test/r/fulltext3.result	2007-07-13 03:29:22 +05:00
@@ -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 -Nrup a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test
--- a/mysql-test/t/fulltext.test	2007-07-13 03:25:24 +05:00
+++ b/mysql-test/t/fulltext.test	2007-07-13 03:29:22 +05:00
@@ -400,15 +400,6 @@ SELECT * FROM t1 WHERE MATCH(a) AGAINST(
 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 -Nrup a/mysql-test/t/fulltext3.test b/mysql-test/t/fulltext3.test
--- a/mysql-test/t/fulltext3.test	2007-07-06 23:35:02 +05:00
+++ b/mysql-test/t/fulltext3.test	2007-07-13 03:29:22 +05:00
@@ -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