diff options
| author | unknown <serg@sergbook.mylan> | 2003-11-08 15:41:24 +0100 |
|---|---|---|
| committer | unknown <serg@sergbook.mylan> | 2003-11-08 15:41:24 +0100 |
| commit | 21b624f046c4efbb0fd1f25135cc6663ab3ded4e (patch) | |
| tree | b9e0bafcc3ea5b9b3723b3e19379dff712f481b0 /myisam/ft_nlq_search.c | |
| parent | 06fd12c5aef1643519500d0f14bd7f1785e4caf6 (diff) | |
| download | mariadb-git-21b624f046c4efbb0fd1f25135cc6663ab3ded4e.tar.gz | |
fulltext.test, fulltext.result, ft_nlq_search.c:
a bug in latin1_german2 FT fixed
myisam/ft_nlq_search.c:
a bug in latin1_german2 FT fixed
mysql-test/r/fulltext.result:
a bug in latin1_german2 FT fixed
mysql-test/t/fulltext.test:
a bug in latin1_german2 FT fixed
Diffstat (limited to 'myisam/ft_nlq_search.c')
| -rw-r--r-- | myisam/ft_nlq_search.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c index a38c52704f7..4f659216d98 100644 --- a/myisam/ft_nlq_search.c +++ b/myisam/ft_nlq_search.c @@ -73,6 +73,7 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio) uchar *keybuff=aio->keybuff; MI_KEYDEF *keyinfo=info->s->keyinfo+aio->keynr; my_off_t key_root=info->s->state.key_root[aio->keynr]; + uint extra=HA_FT_WLEN+info->s->base.rec_reflength; #if HA_FT_WTYPE == HA_KEYTYPE_FLOAT float tmp_weight; #else @@ -94,7 +95,8 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio) { if (keylen && - mi_compare_text(aio->charset,info->lastkey,keylen, keybuff,keylen,0)) + mi_compare_text(aio->charset,info->lastkey+1, + info->lastkey_length-extra, keybuff+1,keylen,0)) break; subkeys=ft_sintXkorr(info->lastkey+keylen); |