diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-10 18:17:43 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-10 18:17:43 +0300 |
| commit | ce3b7273a6b5b5bf3dc4a0f3c72ef9889d091f59 (patch) | |
| tree | d7eed818fd8b648e5eabe0dbad53e61665d8dc37 /sql/multi_range_read.cc | |
| parent | 355e250544e69df7b547d8950bc9febfc5668be6 (diff) | |
| parent | 82b49178600e3b21f378bef71b8f9e81bc7bcd3a (diff) | |
| download | mariadb-git-ce3b7273a6b5b5bf3dc4a0f3c72ef9889d091f59.tar.gz | |
Merge with MariaDB 5.2
Diffstat (limited to 'sql/multi_range_read.cc')
| -rw-r--r-- | sql/multi_range_read.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc index 37ce7c3f840..cbd98cb41af 100644 --- a/sql/multi_range_read.cc +++ b/sql/multi_range_read.cc @@ -998,7 +998,9 @@ int DsMrr_impl::setup_two_handlers() DBUG_RETURN(1); /* Create a separate handler object to do rnd_pos() calls. */ - if (!(new_h2= primary_file->clone(thd->mem_root)) || + if (!(new_h2= primary_file->clone(primary_file->get_table()->s-> + normalized_path.str, + thd->mem_root)) || new_h2->ha_external_lock(thd, F_RDLCK)) { delete new_h2; |