diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-12 00:54:35 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-12 00:54:35 +0300 |
| commit | 65575f94d1dad0d130f3180e5bafa71eb6be1bcd (patch) | |
| tree | 24233cf112742394baadb954377539515a28de33 /myisam/ft_parser.c | |
| parent | 8dd2e5b8d93d79965e833e3b979675240478c591 (diff) | |
| download | mariadb-git-65575f94d1dad0d130f3180e5bafa71eb6be1bcd.tar.gz | |
Added SQL_CALC_FOUND_ROWS and FOUND_ROWS()
myisam/ft_boolean_search.c:
Cleanup
myisam/ft_parser.c:
Cleanup
myisam/ft_update.c:
Cleanup
myisam/sort.c:
Cleanup
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'myisam/ft_parser.c')
| -rw-r--r-- | myisam/ft_parser.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/myisam/ft_parser.c b/myisam/ft_parser.c index d1daa581446..09c93d7dc5b 100644 --- a/myisam/ft_parser.c +++ b/myisam/ft_parser.c @@ -161,7 +161,7 @@ byte ft_get_word(byte **start, byte *end, FT_WORD *word, FTB_PARAM *param) param->prev='A'; // be sure *prev is true_word_char word->len= (uint)(doc-word->pos) - mwc; - if (param->trunc=(doc<end && *doc == FTB_TRUNC)) + if ((param->trunc=(doc<end && *doc == FTB_TRUNC))) doc++; if (word->len >= MIN_WORD_LEN && word->len < MAX_WORD_LEN && @@ -221,7 +221,6 @@ int is_boolean(byte *q, uint len) TREE * ft_parse(TREE *wtree, byte *doc, int doclen) { byte *end=doc+doclen; - int res; FT_WORD w; if (!is_tree_inited(wtree)) @@ -229,7 +228,7 @@ TREE * ft_parse(TREE *wtree, byte *doc, int doclen) init_tree(wtree,0,sizeof(FT_WORD),(qsort_cmp)&FT_WORD_cmp,0,NULL); } - while (res=ft_simple_get_word(&doc,end,&w)) + while (ft_simple_get_word(&doc,end,&w)) { if (!tree_insert(wtree, &w, 0)) goto err; |