diff options
| author | monty@narttu.mysql.fi <> | 2002-08-30 12:40:40 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2002-08-30 12:40:40 +0300 |
| commit | 7134ffec210edde21860a2b2c2654be481de49b4 (patch) | |
| tree | 1bb81fd601075133af9ee99bd7ac94baf5ffc46c /myisam/ft_nlq_search.c | |
| parent | 921f7c9c551d9e1bdd5083ebe71d204ab6246ba1 (diff) | |
| parent | dd5382187e68ff5337e1fe7ba5f86f0d9cdd31d5 (diff) | |
| download | mariadb-git-7134ffec210edde21860a2b2c2654be481de49b4.tar.gz | |
Merge with 4.0.3
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
Diffstat (limited to 'myisam/ft_nlq_search.c')
| -rw-r--r-- | myisam/ft_nlq_search.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c index 5670edde7c0..f3fa8865bc6 100644 --- a/myisam/ft_nlq_search.c +++ b/myisam/ft_nlq_search.c @@ -98,9 +98,10 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio) while (!r) { - if (_mi_compare_text(aio->charset, - aio->info->lastkey,keylen, - aio->keybuff,keylen,0)) break; + if (mi_compare_text(aio->charset, + aio->info->lastkey,keylen, + aio->keybuff,keylen,0)) + break; #if HA_FT_WTYPE == HA_KEYTYPE_FLOAT #ifdef EVAL_RUN @@ -120,7 +121,7 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio) sdoc.doc.dpos=aio->info->lastpos; /* saving document matched into dtree */ - if (!(selem=tree_insert(&aio->dtree, &sdoc, 0))) + if (!(selem=tree_insert(&aio->dtree, &sdoc, 0, aio->dtree.custom_arg))) return 1; sptr=(FT_SUPERDOC *)ELEMENT_KEY((&aio->dtree), selem); |