diff options
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/ft_dump.c | 6 | ||||
| -rw-r--r-- | myisam/ftdefs.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/myisam/ft_dump.c b/myisam/ft_dump.c index f8e0fab8357..a693878acd9 100644 --- a/myisam/ft_dump.c +++ b/myisam/ft_dump.c @@ -27,7 +27,7 @@ static int count=0, stats=0, dump=0, verbose=0, lstats=0; static char *query=NULL; static uint lengths[256]; -#define MAX (HA_FT_MAXLEN+10) +#define MAX_LEN (HA_FT_MAXLEN+10) #define HOW_OFTEN_TO_WRITE 10000 int main(int argc,char *argv[]) @@ -37,7 +37,7 @@ int main(int argc,char *argv[]) float weight; double gws, min_gws=0, avg_gws=0; MI_INFO *info; - char buf[MAX], buf2[MAX], buf_maxlen[MAX], buf_min_gws[MAX]; + char buf[MAX_LEN], buf2[MAX_LEN], buf_maxlen[MAX_LEN], buf_min_gws[MAX_LEN]; ulong total=0, maxlen=0, uniq=0, max_doc_cnt=0; struct { MI_INFO *info; } aio0, *aio=&aio0; /* for GWS_IN_USE */ @@ -105,7 +105,7 @@ int main(int argc,char *argv[]) #error #endif - snprintf(buf,MAX,"%.*s",(int) keylen,info->lastkey+1); + snprintf(buf,MAX_LEN,"%.*s",(int) keylen,info->lastkey+1); casedn_str(buf); total++; lengths[keylen]++; diff --git a/myisam/ftdefs.h b/myisam/ftdefs.h index f8b50cb45b9..1a3c0ef60dc 100644 --- a/myisam/ftdefs.h +++ b/myisam/ftdefs.h @@ -135,7 +135,7 @@ FT_WORD * ft_linearize(/*MI_INFO *, uint, byte *, */TREE *); FT_WORD * _mi_ft_parserecord(MI_INFO *, uint, byte *, const byte *); uint _mi_ft_parse(TREE *parsed, MI_INFO *info, uint keynr, const byte *record); -const struct _ft_vft _ft_vft_nlq; +extern const struct _ft_vft _ft_vft_nlq; FT_INFO *ft_init_nlq_search(MI_INFO *, uint, byte *, uint, my_bool); int ft_nlq_read_next(FT_INFO *, char *); float ft_nlq_find_relevance(FT_INFO *, byte *, uint); @@ -144,7 +144,7 @@ float ft_nlq_get_relevance(FT_INFO *); my_off_t ft_nlq_get_docid(FT_INFO *); void ft_nlq_reinit_search(FT_INFO *); -const struct _ft_vft _ft_vft_boolean; +extern const struct _ft_vft _ft_vft_boolean; FT_INFO *ft_init_boolean_search(MI_INFO *, uint, byte *, uint, my_bool); int ft_boolean_read_next(FT_INFO *, char *); float ft_boolean_find_relevance(FT_INFO *, byte *, uint); |