diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-04-20 19:53:08 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-04-20 19:53:08 +0200 |
| commit | 0d857c2c84376a976410c9ee2474d7abcd2336f2 (patch) | |
| tree | fa51d3c04c53ac900a866138d59e1b6796fe2d52 /sql/opt_range.cc | |
| parent | 2f972fef46de74ecab999879421f42b2d67609f4 (diff) | |
| parent | 482c0b7d421aa3f4eec2c3ca49be4ce3795fe191 (diff) | |
| download | mariadb-git-0d857c2c84376a976410c9ee2474d7abcd2336f2.tar.gz | |
Manual merge from 5.1
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 4cdabab31ae..6e106010968 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1368,7 +1368,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 |