mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 07:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge with MariaDB 5.2

Browse source
This commit is contained in:
Michael Widenius 2011-05-10 18:17:43 +03:00
commit f34be18938
639 changed files with 11584 additions and 4494 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/opt_range.cc
View file

@ -1665,7 +1665,7 @@ SQL_SELECT *make_select(TABLE *head, table_map const_tables,
select->read_tables=read_tables;
select->const_tables=const_tables;
select->head=head;
select->cond=conds;
select->cond= select->original_cond= conds;
if (head->sort.io_cache)
{
@ -1959,7 +1959,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