diff options
| author | monty@mysql.com <> | 2004-05-27 23:45:22 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-27 23:45:22 +0300 |
| commit | e9b7e3baa8f6c48360c76c4f61ccc474e9703805 (patch) | |
| tree | e6a68f74869e5c89bff76d93a95a162b9404b595 | |
| parent | 3ad2158b42a327e325c46c8fbaeabfca6b37f52f (diff) | |
| parent | 1aa3b2c79e8ec5903a80f21226e6219ed60f2a9d (diff) | |
| download | mariadb-git-e9b7e3baa8f6c48360c76c4f61ccc474e9703805.tar.gz | |
merge with 4.0 to get fix to VC++ project files
| -rw-r--r-- | VC++Files/sql/mysqld.dsp | 2 | ||||
| -rw-r--r-- | myisam/ft_boolean_search.c | 2 | ||||
| -rw-r--r-- | mysql-test/t/fulltext.test | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp index fccecc7fa3c..3f6b591cbdb 100644 --- a/VC++Files/sql/mysqld.dsp +++ b/VC++Files/sql/mysqld.dsp @@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=xilink6.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\dbug.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /debug /machine:I386 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /debug /machine:I386 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-nt.exe" # SUBTRACT LINK32 /pdb:none /debug 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) diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test index ac88125965a..b67997e640b 100644 --- a/mysql-test/t/fulltext.test +++ b/mysql-test/t/fulltext.test @@ -73,6 +73,10 @@ select * from t1 where MATCH a,b AGAINST ('"xt indexes"' IN BOOLEAN MODE); select * from t1 where MATCH a,b AGAINST('"space model' IN BOOLEAN MODE); +# bug#2708, bug#3870 crash + +select * from t1 where MATCH a,b AGAINST('"space model' IN BOOLEAN MODE); + # boolean w/o index: select * from t1 where MATCH a AGAINST ("search" IN BOOLEAN MODE); |