Merge with MariaDB 5.1

This commit is contained in:
Michael Widenius 2011-05-03 19:10:10 +03:00
commit 1be5462d59
607 changed files with 10981 additions and 4283 deletions

View file

@ -1334,7 +1334,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler)
}
thd= head->in_use;
if (!(file= head->file->clone(thd->mem_root)))
if (!(file= head->file->clone(head->s->normalized_path.str, thd->mem_root)))
{
/*
Manually set the error flag. Note: there seems to be quite a few