database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-376: Wrong result (missing rows) with index_merge+index_merge_intersection, join

Browse Source 
- Let QUICK_RANGE_SELECT::init_ror_merged_scan() call  quick->reset() only 
  after we've set the column read bitmaps.
This commit is contained in:
Sergey Petrunya
2012-07-04 14:34:45 +04:00
parent f8f65accf9
commit 46525c35b0
3 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/opt_range.cc
View File

@ -2008,7 +2008,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler)
if (reuse_handler)
{
DBUG_PRINT("info", ("Reusing handler 0x%lx", (long) file));
if (init() || reset())
if (init())
{
DBUG_RETURN(1);
}
@ -2043,7 +2043,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler)
if (file->ha_external_lock(thd, F_RDLCK))
goto failure;
if (init() || reset())
if (init())
{
file->ha_external_lock(thd, F_UNLCK);
file->ha_close();
@ -2090,7 +2090,18 @@ end:
head->key_read= org_key_read;
bitmap_copy(&column_bitmap, head->read_set);
head->column_bitmaps_set(&column_bitmap, &column_bitmap);
if (reset())
{
if (!reuse_handler)
{
file->ha_external_lock(thd, F_UNLCK);
file->ha_close();
goto failure;
}
else
DBUG_RETURN(1);
}
DBUG_RETURN(0);
failure: