diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2010-09-16 16:20:35 +0400 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2010-09-16 16:20:35 +0400 |
| commit | dcad3feb1c4c75633ffa3024d5d2f2ddd1efdb4a (patch) | |
| tree | 65a93d10b2a6623731030885591ad60f8d3bbec3 /sql/opt_range.cc | |
| parent | 327eb7b680f3afbe8e98c2b693a34247fb67e020 (diff) | |
| parent | 86d7cbd450ab53012e4f4f892e4cdb6093a7313b (diff) | |
| download | mariadb-git-dcad3feb1c4c75633ffa3024d5d2f2ddd1efdb4a.tar.gz | |
5.1-bugteam->5.5-merge
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index b9819def54d..ffff9e3f6c8 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -8550,9 +8550,14 @@ int QUICK_RANGE_SELECT::reset() in_range= FALSE; cur_range= (QUICK_RANGE**) ranges.buffer; - if (file->inited == handler::NONE && (error= file->ha_index_init(index,1))) - DBUG_RETURN(error); - + if (file->inited == handler::NONE) + { + if (in_ror_merged_scan) + head->column_bitmaps_set_no_signal(&column_bitmap, &column_bitmap); + if ((error= file->ha_index_init(index,1))) + DBUG_RETURN(error); + } + /* Do not allocate the buffers twice. */ if (multi_range_length) { |