diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-01-11 19:01:03 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-01-11 19:01:03 +0200 |
| commit | b32bed74e9ef40c6557ff3fc040adc20674baff9 (patch) | |
| tree | cca15d8a08a42e20942a772d23c99d18b9de7d4e /storage/maria/ma_ft_boolean_search.c | |
| parent | 0d01dd200f97835dfb4e23676332f0ea28050c33 (diff) | |
| parent | e6ba9d285aa41bb3d691cba7445b9b5479e34eaf (diff) | |
| download | mariadb-git-b32bed74e9ef40c6557ff3fc040adc20674baff9.tar.gz | |
Merge with 5.2 (To get in fixes for Aria)
Diffstat (limited to 'storage/maria/ma_ft_boolean_search.c')
| -rw-r--r-- | storage/maria/ma_ft_boolean_search.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/maria/ma_ft_boolean_search.c b/storage/maria/ma_ft_boolean_search.c index 1b153f1a76f..13c3a24f362 100644 --- a/storage/maria/ma_ft_boolean_search.c +++ b/storage/maria/ma_ft_boolean_search.c @@ -357,6 +357,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; 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; @@ -381,6 +382,7 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search) } 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; |