bk commit into 5.1 tree (svoj:1.2054)

[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
  1.2054 06/01/16 22:27:36 svoj@april.(none) +2 -0
  Merge svojtovich@stripped:/home/bk/mysql-5.1-new
  into  april.(none):/home/svoj/devel/mysql/BUG14194/mysql-5.1-new

  mysql-test/t/fulltext.test
    1.80 06/01/16 22:27:30 svoj@april.(none) +0 -0
    Auto merged

  mysql-test/r/fulltext.result
    1.84 06/01/16 22:27:30 svoj@april.(none) +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:	april.(none)
# Root:	/home/svoj/devel/mysql/BUG14194/mysql-5.1-new/RESYNC

--- 1.83/mysql-test/r/fulltext.result	2006-01-13 21:25:07 +04:00
+++ 1.84/mysql-test/r/fulltext.result	2006-01-16 22:27:30 +04:00
@@ -436,6 +436,10 @@
 SELECT a FROM t1 WHERE MATCH a AGAINST('testword\'\'' IN BOOLEAN MODE);
 a
 testword''
+INSERT INTO t1 VALUES('test\'s');
+SELECT a FROM t1 WHERE MATCH a AGAINST('test' IN BOOLEAN MODE);
+a
+test's
 DROP TABLE t1;
 CREATE TABLE t1 (a VARCHAR(10000), FULLTEXT(a));
 SHOW CREATE TABLE t1;

--- 1.79/mysql-test/t/fulltext.test	2006-01-13 21:25:07 +04:00
+++ 1.80/mysql-test/t/fulltext.test	2006-01-16 22:27:30 +04:00
@@ -355,6 +355,12 @@
 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);
+
+#
+# BUG#14194: Problem with fulltext boolean search and apostrophe
+#
+INSERT INTO t1 VALUES('test\'s');
+SELECT a FROM t1 WHERE MATCH a AGAINST('test' IN BOOLEAN MODE);
 DROP TABLE t1;
 
 #