diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-01-11 15:36:41 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-01-11 15:36:41 +0200 |
| commit | 050c004f5e6f152f5c4cdadda8a15e01d2f07a9a (patch) | |
| tree | f5828daced42ff651d5f822af17844154fb9ffd1 /storage/maria/ma_ft_boolean_search.c | |
| parent | e63b5546c597f65696868eaf69159107bc4a8e44 (diff) | |
| parent | 2eaa76b84426b19f8574876ad1fa85ae6cfe3196 (diff) | |
| download | mariadb-git-050c004f5e6f152f5c4cdadda8a15e01d2f07a9a.tar.gz | |
Merge with 5.1
Fixes to get Aria handler tests to work.
Fixes LP#697597 "HANDLER + Aria asserts in maria-5.3-handler"
Diffstat (limited to 'storage/maria/ma_ft_boolean_search.c')
| -rw-r--r-- | storage/maria/ma_ft_boolean_search.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ma_ft_boolean_search.c b/storage/maria/ma_ft_boolean_search.c index 0783f679843..1b153f1a76f 100644 --- a/storage/maria/ma_ft_boolean_search.c +++ b/storage/maria/ma_ft_boolean_search.c @@ -356,7 +356,7 @@ 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; key.data= ftbw->word; key.data_length= ftbw->len; key.ref_length= 0; @@ -380,7 +380,7 @@ 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; key.data= lastkey_buf; key.data_length= USE_WHOLE_KEY; key.ref_length= 0; |