diff options
| author | unknown <serg@serg.mylan> | 2005-02-04 15:24:06 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-02-04 15:24:06 +0100 |
| commit | 8c750c466b0109723233e93aea85a39673409b40 (patch) | |
| tree | 2046dfa1cc3d0a3296de2bdfbd4d1ad59ece8f58 /myisam/ft_static.c | |
| parent | c83412f7059f54b8e7065d63fc544125ebf30aaa (diff) | |
| download | mariadb-git-8c750c466b0109723233e93aea85a39673409b40.tar.gz | |
indexless boolean fulltext search was depending on default_charset_info - Bug#8159
ftbw->off wasn't cleared on reinit - Bug#8234
include/ft_global.h:
get rid of default_charset_info in indexless fulltext searches
myisam/ft_boolean_search.c:
get rid of default_charset_info in indexless fulltext searches
clear ftbw->off on reinits
myisam/ft_static.c:
get rid of default_charset_info in indexless fulltext searches
myisam/ftdefs.h:
get rid of default_charset_info in indexless fulltext searches
sql/ha_myisam.h:
get rid of default_charset_info in indexless fulltext searches
sql/handler.h:
get rid of default_charset_info in indexless fulltext searches
sql/item_func.cc:
get rid of default_charset_info in indexless fulltext searches
Diffstat (limited to 'myisam/ft_static.c')
| -rw-r--r-- | myisam/ft_static.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/myisam/ft_static.c b/myisam/ft_static.c index 7168406d027..994a94d0c49 100644 --- a/myisam/ft_static.c +++ b/myisam/ft_static.c @@ -55,11 +55,12 @@ const struct _ft_vft _ft_vft_boolean = { FT_INFO *ft_init_search(uint flags, void *info, uint keynr, - byte *query, uint query_len, byte *record) + byte *query, uint query_len, CHARSET_INFO *cs, + byte *record) { FT_INFO *res; if (flags & FT_BOOL) - res= ft_init_boolean_search((MI_INFO *)info, keynr, query, query_len); + res= ft_init_boolean_search((MI_INFO *)info, keynr, query, query_len,cs); else res= ft_init_nlq_search((MI_INFO *)info, keynr, query, query_len, flags, record); |