summaryrefslogtreecommitdiff
path: root/sql/records.cc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2010-09-19 18:46:39 -0700
committerIgor Babaev <igor@askmonty.org>2010-09-19 18:46:39 -0700
commit3c313312bbcd76cf9f8e34fd82622240b6a7c337 (patch)
tree551be33d932cb25674b613a5ca4be404d1e38e07 /sql/records.cc
parent65d66ae1fcfe54cee33ff4402a8791ae3db52863 (diff)
downloadmariadb-git-3c313312bbcd76cf9f8e34fd82622240b6a7c337.tar.gz
Fixed bug #56862 (lp bug #640419).
Made sure that rr_quick is used to read the next record whenever a quick select is used to retrieve the table records.
Diffstat (limited to 'sql/records.cc')
-rw-r--r--sql/records.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/records.cc b/sql/records.cc
index 2fc5a26a210..827450201c9 100644
--- a/sql/records.cc
+++ b/sql/records.cc
@@ -196,7 +196,8 @@ void 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 ?