bk commit into 5.1 tree (svoj:1.2053) BUG#14194

[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.2053 06/01/13 23:34:38 svoj@april.(none) +3 -0
  BUG#14194: Problem with fulltext boolean search and apostrophe
  Fixed that single apostrophe was considered as a word character.

  storage/myisam/ftdefs.h
    1.34 06/01/13 23:34:32 svoj@april.(none) +1 -1
    Fixed that single apostrophe was considered as a word character.

  mysql-test/t/fulltext.test
    1.79 06/01/13 23:34:32 svoj@april.(none) +6 -0
    A test case for BUG#14194 added.

  mysql-test/r/fulltext.result
    1.83 06/01/13 23:34:32 svoj@april.(none) +4 -0
    A test case for BUG#14194 added.

# 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

--- 1.33/storage/myisam/ftdefs.h	2005-12-28 16:05:20 +04:00
+++ 1.34/storage/myisam/ftdefs.h	2006-01-13 23:34:32 +04:00
@@ -25,7 +25,7 @@
 #include <plugin.h>
 
 #define true_word_char(s,X)	(my_isalnum(s,X) || (X)=='_')
-#define misc_word_char(X)	((X)=='\'')
+#define misc_word_char(X)	0
 #define word_char(s,X)		(true_word_char(s,X) || misc_word_char(X))
 
 #define FT_MAX_WORD_LEN_FOR_SORT 31

--- 1.82/mysql-test/r/fulltext.result	2005-11-26 23:22:50 +04:00
+++ 1.83/mysql-test/r/fulltext.result	2006-01-13 23:34:32 +04:00
@@ -436,4 +436,8 @@
 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;

--- 1.78/mysql-test/t/fulltext.test	2005-11-26 23:22:50 +04:00
+++ 1.79/mysql-test/t/fulltext.test	2006-01-13 23:34:32 +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;
 
 # End of 4.1 tests