bk commit into 4.1 tree (svoj:1.2368)

[svoj]

Below is the list of changes that have just been committed into a local
4.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
  1.2368 05/08/02 12:12:37 svoj@stripped +3 -0
  Merge mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.0
  into  mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.1

  mysql-test/t/fulltext.test
    1.74 05/08/02 12:12:35 svoj@stripped +11 -11
    Manual merge.

  mysql-test/r/fulltext.result
    1.75 05/08/02 12:12:35 svoj@stripped +8 -8
    Manual merge.

  myisam/sort.c
    1.43 05/08/02 12:00:56 svoj@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	svoj-laptop.mysql.com
# Root:	/home/svoj/devel/mysql/BUG11684/mysql-4.1/RESYNC

--- 1.42/myisam/sort.c	2005-01-24 18:48:16 +04:00
+++ 1.43/myisam/sort.c	2005-08-02 12:00:56 +05:00
@@ -587,13 +587,15 @@
 
       while (!got_error &&
 	     !my_b_read(&sinfo->tempfile_for_exceptions,(byte*)&key_length,
-			sizeof(key_length)) &&
-	     !my_b_read(&sinfo->tempfile_for_exceptions,(byte*)mergebuf,
-			(uint) key_length))
+			sizeof(key_length)))
       {
-	if (_mi_ck_write(info,sinfo->key,(uchar*) mergebuf,
-			 key_length - info->s->rec_reflength))
-	  got_error=1;
+        byte ft_buf[HA_FT_MAXLEN + HA_FT_WLEN + 10];
+        if (key_length > sizeof(ft_buf) ||
+            my_b_read(&sinfo->tempfile_for_exceptions, (byte*)ft_buf,
+                      (uint)key_length) ||
+            _mi_ck_write(info, sinfo->key, (uchar*)ft_buf,
+                         key_length - info->s->rec_reflength))
+          got_error=1;
       }
     }
   }

--- 1.74/mysql-test/r/fulltext.result	2005-06-18 00:42:58 +05:00
+++ 1.75/mysql-test/r/fulltext.result	2005-08-02 12:12:35 +05:00
@@ -421,3 +421,11 @@
 COUNT(*)
 1
 DROP TABLE t1;
+CREATE TABLE t1 (a VARCHAR(30), FULLTEXT(a));
+INSERT INTO t1 VALUES('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
+SET myisam_repair_threads=2;
+REPAIR TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	repair	status	OK
+SET myisam_repair_threads=@@global.myisam_repair_threads;
+DROP TABLE t1;

--- 1.73/mysql-test/t/fulltext.test	2005-07-28 05:21:41 +05:00
+++ 1.74/mysql-test/t/fulltext.test	2005-08-02 12:12:35 +05:00
@@ -339,4 +339,15 @@
 SELECT COUNT(*) FROM t1 WHERE MATCH(t) AGAINST ('"osnabrück"' IN BOOLEAN MODE);
 DROP TABLE t1;
 
+#
+# BUG#11684 - repair crashes mysql when table has fulltext index
+#
+
+CREATE TABLE t1 (a VARCHAR(30), FULLTEXT(a));
+INSERT INTO t1 VALUES('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
+SET myisam_repair_threads=2;
+REPAIR TABLE t1;
+SET myisam_repair_threads=@@global.myisam_repair_threads;
+DROP TABLE t1;
+
 # End of 4.1 tests