diff options
| author | unknown <serg@serg.mylan> | 2005-02-04 15:31:39 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-02-04 15:31:39 +0100 |
| commit | 386297dc27cd10b530ff13e5443f50d28449e416 (patch) | |
| tree | 01c66c5c69b4c95dd26d4e4d07d34a09e911eedc /include | |
| parent | 1a3a4ee3e64c6418300d9afa0ba0e402407917c8 (diff) | |
| parent | 8c750c466b0109723233e93aea85a39673409b40 (diff) | |
| download | mariadb-git-386297dc27cd10b530ff13e5443f50d28449e416.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
sql/item_func.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/ft_global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ft_global.h b/include/ft_global.h index 94f6ad9ef51..c3f60d13a7a 100644 --- a/include/ft_global.h +++ b/include/ft_global.h @@ -62,7 +62,7 @@ void ft_free_stopwords(void); #define FT_SORTED 2 #define FT_EXPAND 4 /* query expansion */ -FT_INFO *ft_init_search(uint,void *, uint, byte *, uint, byte *); +FT_INFO *ft_init_search(uint,void *, uint, byte *, uint,CHARSET_INFO *, byte *); my_bool ft_boolean_check_syntax_string(const byte *); #ifdef __cplusplus |