diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-10-06 13:11:06 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-10-06 13:11:06 +0300 |
| commit | 00a2f36bbf22a4d8b2367724e7919c0603cf6f71 (patch) | |
| tree | 71973f36df84d2f49752b01d6d18df9ec76f710c /sql/records.cc | |
| parent | 7d66e48d129ea46ace7c0d5dd67e39b3bae749ba (diff) | |
| parent | ab428381ab27ffd04d44503a9dd0dd8d0ec3f27d (diff) | |
| download | mariadb-git-00a2f36bbf22a4d8b2367724e7919c0603cf6f71.tar.gz | |
Automatic merge with 5.1
Diffstat (limited to 'sql/records.cc')
| -rw-r--r-- | sql/records.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/records.cc b/sql/records.cc index 4c75ec10f0a..bdb27322a28 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -197,7 +197,8 @@ bool init_read_record(READ_RECORD *info,THD *thd, TABLE *table, tempfile= &select->file; else tempfile= table->sort.io_cache; - if (tempfile && my_b_inited(tempfile)) // Test if ref-records was used + if (tempfile && my_b_inited(tempfile) && + !(select && select->quick)) { DBUG_PRINT("info",("using rr_from_tempfile")); info->read_record= (table->sort.addon_field ? |