database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 5.5->mwl248

Browse Source
This commit is contained in:
Igor Babaev
2012-12-04 19:04:25 -08:00
parent e42024cd0a 5e345281e3
commit f8bfb65b13
120 changed files with 4954 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/opt_range.cc
View File

@ -10943,6 +10943,13 @@ int QUICK_RANGE_SELECT::reset()
DBUG_ENTER("QUICK_RANGE_SELECT::reset");
last_range= NULL;
cur_range= (QUICK_RANGE**) ranges.buffer;
if (file->inited == handler::RND)
{
/* Handler could be left in this state by MRR */
if ((error= file->ha_rnd_end()))
DBUG_RETURN(error);
}
if (file->inited == handler::NONE)
{