diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ft_global.h | 2 | ||||
| -rw-r--r-- | include/mysql/plugin.h | 13 | ||||
| -rw-r--r-- | include/mysql/plugin.h.pp | 11 |
3 files changed, 16 insertions, 10 deletions
diff --git a/include/ft_global.h b/include/ft_global.h index dba8a6e75e5..8fe5ee5c42e 100644 --- a/include/ft_global.h +++ b/include/ft_global.h @@ -76,6 +76,8 @@ my_bool ft_boolean_check_syntax_string(const uchar *); extern const HA_KEYSEG ft_keysegs[FT_SEGS]; +typedef union {int32 i; float f;} FT_WEIGTH; + #ifdef __cplusplus } #endif diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 91e8a80b408..b33f5970110 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -564,19 +564,22 @@ typedef struct st_mysql_ftparser_boolean_info nothing. See enum_ftparser_mode above. */ +/* TODO: Change the following int to size_t at next ABI update */ +typedef int mysql_ft_size_t; + typedef struct st_mysql_ftparser_param { int (*mysql_parse)(struct st_mysql_ftparser_param *, - const unsigned char *doc, size_t doc_len); + const unsigned char *doc, mysql_ft_size_t doc_len); int (*mysql_add_word)(struct st_mysql_ftparser_param *, - const unsigned char *word, size_t word_len, + const unsigned char *word, mysql_ft_size_t word_len, MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info); void *ftparser_state; void *mysql_ftparam; struct charset_info_st *cs; - char *doc; - int length; - int flags; + const unsigned char *doc; + mysql_ft_size_t length; + unsigned int flags; enum enum_ftparser_mode mode; } MYSQL_FTPARSER_PARAM; diff --git a/include/mysql/plugin.h.pp b/include/mysql/plugin.h.pp index 22b1f647736..2f44870b479 100644 --- a/include/mysql/plugin.h.pp +++ b/include/mysql/plugin.h.pp @@ -70,19 +70,20 @@ typedef struct st_mysql_ftparser_boolean_info char prev; char *quot; } MYSQL_FTPARSER_BOOLEAN_INFO; +typedef int mysql_ft_size_t; typedef struct st_mysql_ftparser_param { int (*mysql_parse)(struct st_mysql_ftparser_param *, - const unsigned char *doc, size_t doc_len); + const unsigned char *doc, mysql_ft_size_t doc_len); int (*mysql_add_word)(struct st_mysql_ftparser_param *, - const unsigned char *word, size_t word_len, + const unsigned char *word, mysql_ft_size_t word_len, MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info); void *ftparser_state; void *mysql_ftparam; struct charset_info_st *cs; - char *doc; - int length; - int flags; + const unsigned char *doc; + mysql_ft_size_t length; + unsigned int flags; enum enum_ftparser_mode mode; } MYSQL_FTPARSER_PARAM; struct st_mysql_ftparser |