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

Merge april.(none):/home/svoj/devel/mysql/BUG20256/mysql-5.0-engines

into  april.(none):/home/svoj/devel/mysql/BUG20256/mysql-5.1-engines
This commit is contained in:
svoj@april.(none)
2006-09-12 18:42:10 +05:00
6 changed files with 52 additions and 5 deletions

View File

@ -1164,11 +1164,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler)
}
thd= head->in_use;
if (!(file= get_new_handler(head->s, thd->mem_root, head->s->db_type)))
goto failure;
DBUG_PRINT("info", ("Allocated new handler 0x%lx", (long) file));
if (file->ha_open(head, head->s->normalized_path.str, head->db_stat,
HA_OPEN_IGNORE_IF_LOCKED))
if (!(file= head->file->clone(thd->mem_root)))
{
/* Caller will free the memory */
goto failure;