diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-13 23:45:16 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-13 23:45:16 +0300 |
| commit | c0f04fa31cd46c2507b2152eeeeb4950e0d5edc9 (patch) | |
| tree | b0696b0df90fdc17d6801d14229c74167f00647d /sql/opt_range.cc | |
| parent | c9b95de246ccaad22abf90996f295b05fe85f53d (diff) | |
| parent | cee888acb36141136cdb121a7bb7d53200b14cb6 (diff) | |
| download | mariadb-git-c0f04fa31cd46c2507b2152eeeeb4950e0d5edc9.tar.gz | |
Automatic merge
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 910bbf2d975..dba72d76bb4 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2001,7 +2001,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler) { handler *save_file= file, *org_file; my_bool org_key_read; - THD *thd; + THD *thd= head->in_use; DBUG_ENTER("QUICK_RANGE_SELECT::init_ror_merged_scan"); in_ror_merged_scan= 1; @@ -2023,7 +2023,6 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler) DBUG_RETURN(0); } - thd= head->in_use; if (!(file= head->file->clone(head->s->normalized_path.str, thd->mem_root))) { /* |