diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-22 11:15:47 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-22 11:15:47 +0200 |
| commit | 4ad6d6b6c9e551d84fe727d1f48edc8722098bfd (patch) | |
| tree | e305bc182a35eaf41802e4cc51a61bfd5bde5cd2 /storage/maria/ma_ft_boolean_search.c | |
| parent | 38e3787af4ac87274c7ef0e632a97aa1217e284a (diff) | |
| parent | 2c7d6f12ee10903c3002bba42ee15abc2b89fa8e (diff) | |
| download | mariadb-git-4ad6d6b6c9e551d84fe727d1f48edc8722098bfd.tar.gz | |
Merge in new handler and handlersocket code into 5.3 main
Diffstat (limited to 'storage/maria/ma_ft_boolean_search.c')
| -rw-r--r-- | storage/maria/ma_ft_boolean_search.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/maria/ma_ft_boolean_search.c b/storage/maria/ma_ft_boolean_search.c index 0783f679843..13c3a24f362 100644 --- a/storage/maria/ma_ft_boolean_search.c +++ b/storage/maria/ma_ft_boolean_search.c @@ -356,7 +356,8 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search) { ftbw->key_root=info->s->state.key_root[ftb->keynr]; ftbw->keyinfo=info->s->keyinfo+ftb->keynr; - key.keyinfo= ftbw->keyinfo; + info->last_key.keyinfo= key.keyinfo= ftbw->keyinfo; + info->lastinx= ~0; /* Safety */ key.data= ftbw->word; key.data_length= ftbw->len; key.ref_length= 0; @@ -380,7 +381,8 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search) max_docid); } - key.keyinfo= ftbw->keyinfo; + info->last_key.keyinfo= key.keyinfo= ftbw->keyinfo; + info->lastinx= ~0; /* Safety */ key.data= lastkey_buf; key.data_length= USE_WHOLE_KEY; key.ref_length= 0; |