bk commit into 4.1 tree (serg:1.2472) BUG#5686

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
4.1 repository of serg. When serg 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.2472 05/11/26 19:36:11 serg@stripped +3 -0
  followup for for the bug#5686

  mysql-test/t/fulltext.test
    1.76 05/11/26 19:35:59 serg@stripped +1 -0
    followup for for the bug#5686

  mysql-test/r/fulltext.result
    1.77 05/11/26 19:35:59 serg@stripped +3 -0
    followup for for the bug#5686

  myisam/ft_parser.c
    1.46 05/11/26 19:35:59 serg@stripped +3 -1
    followup for for the bug#5686

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-4.1

--- 1.45/myisam/ft_parser.c	Sat Nov 12 08:24:58 2005
+++ 1.46/myisam/ft_parser.c	Sat Nov 26 19:35:59 2005
@@ -147,8 +147,10 @@ byte ft_get_word(CHARSET_INFO *cs, byte 
     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++;
 
     param->prev='A'; /* be sure *prev is true_word_char */
     word->len= (uint)(doc-word->pos) - mwc;

--- 1.76/mysql-test/r/fulltext.result	Sat Nov 12 08:24:58 2005
+++ 1.77/mysql-test/r/fulltext.result	Sat Nov 26 19:35:59 2005
@@ -432,4 +432,7 @@ INSERT INTO t1 VALUES('testword\'\'');
 SELECT a FROM t1 WHERE MATCH a AGAINST('testword' IN BOOLEAN MODE);
 a
 testword''
+SELECT a FROM t1 WHERE MATCH a AGAINST('testword\'\'' IN BOOLEAN MODE);
+a
+testword''
 DROP TABLE t1;

--- 1.75/mysql-test/t/fulltext.test	Sat Nov 12 08:24:58 2005
+++ 1.76/mysql-test/t/fulltext.test	Sat Nov 26 19:35:59 2005
@@ -354,6 +354,7 @@ SET myisam_repair_threads=@@global.myisa
 #
 INSERT INTO t1 VALUES('testword\'\'');
 SELECT a FROM t1 WHERE MATCH a AGAINST('testword' IN BOOLEAN MODE);
+SELECT a FROM t1 WHERE MATCH a AGAINST('testword\'\'' IN BOOLEAN MODE);
 DROP TABLE t1;
 
 # End of 4.1 tests