diff options
| author | unknown <jimw@mysql.com> | 2005-02-04 11:59:02 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-02-04 11:59:02 -0800 |
| commit | 1be345edc0cc351029dc207d836ced1742bdfd8d (patch) | |
| tree | 51df5e0d0334e67749bc68845ba7a952061390a5 /myisam/ft_static.c | |
| parent | 74ad9e8f1efde5295b9bf0b4bc4a3331d0faab4f (diff) | |
| parent | 2f91118458995b9fe780aa7a5a664765572cdc30 (diff) | |
| download | mariadb-git-1be345edc0cc351029dc207d836ced1742bdfd8d.tar.gz | |
Merge changes
client/mysqlcheck.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/ft_static.c:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysql-test/t/union.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_myisam.h:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/field.cc:
Clean up merge
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 cf4a8dd2a73..e221950f445 100644 --- a/myisam/ft_static.c +++ b/myisam/ft_static.c @@ -57,11 +57,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); |