bk commit into 5.0 tree (bell:1.1958)

[sanja]

Below is the list of changes that have just been committed into a local
5.0 repository of bell. When bell 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.1958 05/11/15 19:22:00 bell@stripped +3 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0

  mysql-test/t/fulltext.test
    1.77 05/11/15 19:21:55 bell@stripped +0 -0
    Auto merged

  mysql-test/r/fulltext.result
    1.81 05/11/15 19:21:55 bell@stripped +0 -0
    Auto merged

  myisam/ft_parser.c
    1.47 05/11/15 19:21:54 bell@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:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-bug6-5.0/RESYNC

--- 1.46/myisam/ft_parser.c	2005-03-09 14:37:15 +02:00
+++ 1.47/myisam/ft_parser.c	2005-11-15 19:21:54 +02:00
@@ -196,8 +196,10 @@
     for (word->pos=doc; doc<end; length++, mbl=my_mbcharlen(cs, *(uchar *)doc), doc+=(mbl ? mbl : 1))
       if (true_word_char(cs,*doc))
         mwc= 0;
-      else if (!misc_word_char(*doc) || mwc++)
+      else if (!misc_word_char(*doc) || mwc)
         break;
+      else
+        mwc++;
 
     word->len= (uint)(doc-word->pos) - mwc;
 

--- 1.80/mysql-test/r/fulltext.result	2005-08-12 18:04:47 +03:00
+++ 1.81/mysql-test/r/fulltext.result	2005-11-15 19:21:55 +02:00
@@ -429,4 +429,8 @@
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 SET myisam_repair_threads=@@global.myisam_repair_threads;
+INSERT INTO t1 VALUES('testword\'\'');
+SELECT a FROM t1 WHERE MATCH a AGAINST('testword' IN BOOLEAN MODE);
+a
+testword''
 DROP TABLE t1;

--- 1.76/mysql-test/t/fulltext.test	2005-08-12 18:04:48 +03:00
+++ 1.77/mysql-test/t/fulltext.test	2005-11-15 19:21:55 +02:00
@@ -348,6 +348,12 @@
 SET myisam_repair_threads=2;
 REPAIR TABLE t1;
 SET myisam_repair_threads=@@global.myisam_repair_threads;
+
+#
+# BUG#5686 - #1034 - Incorrect key file for table - only utf8
+#
+INSERT INTO t1 VALUES('testword\'\'');
+SELECT a FROM t1 WHERE MATCH a AGAINST('testword' IN BOOLEAN MODE);
 DROP TABLE t1;
 
 # End of 4.1 tests