diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-09-30 12:43:43 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-09-30 12:43:43 +0200 |
| commit | bf55d1fcf0bd2dc050eabf6725f827fcf9c10cfe (patch) | |
| tree | 3c8bad484e298eb47244274edb7d539f0f81b691 /sql/opt_range.cc | |
| parent | 0afd0a18feb4501cafb4800115fc25f13171acf6 (diff) | |
| parent | 32de99125a2fa6aace8650e8a4a1a5087fcf614a (diff) | |
| download | mariadb-git-bf55d1fcf0bd2dc050eabf6725f827fcf9c10cfe.tar.gz | |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
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) { |