diff options
| author | unknown <monty@mysql.com> | 2004-05-27 23:45:22 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-27 23:45:22 +0300 |
| commit | 32f20312ee66b77e54bab6a67317098769ab40c4 (patch) | |
| tree | e6a68f74869e5c89bff76d93a95a162b9404b595 /myisam/ft_boolean_search.c | |
| parent | 5df707c7c9fe5ac760c7136ee806be718d2afa04 (diff) | |
| parent | b4a4bc47b414690e1f7299c771b4cf4ef43aa76a (diff) | |
| download | mariadb-git-32f20312ee66b77e54bab6a67317098769ab40c4.tar.gz | |
merge with 4.0 to get fix to VC++ project files
VC++Files/comp_err/comp_err.dsp:
Auto merged
VC++Files/sql/mysqld.dsp:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
myisam/ft_parser.c:
Keep old code
mysql-test/r/fulltext.result:
Remove duplicate test from 4.0
Diffstat (limited to 'myisam/ft_boolean_search.c')
| -rw-r--r-- | myisam/ft_boolean_search.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c index 5f88122e730..345cd3ceb0c 100644 --- a/myisam/ft_boolean_search.c +++ b/myisam/ft_boolean_search.c @@ -421,7 +421,7 @@ err: } -/* returns 1 if str0 ~= /\<str1\>/ */ +/* returns 1 if str0 ~= /\bstr1\b/ */ static int _ftb_strstr(const byte *s0, const byte *e0, const byte *s1, const byte *e1, CHARSET_INFO *cs) |