summaryrefslogtreecommitdiff
path: root/sql/records.cc
diff options
context:
space:
mode:
authorunknown <sanja@askmonty.org>2011-07-21 15:50:25 +0300
committerunknown <sanja@askmonty.org>2011-07-21 15:50:25 +0300
commitef2b4b14e1a917a18b059b49514b7974027d897d (patch)
tree0bd95eb14c1e0e4abd46f4f980e68b5b2d01867e /sql/records.cc
parent4a03a1d777f2c2c4c921a5b52df5da362950b468 (diff)
parent678f4b2de17a6fa42a056422feb7d7c7f24092da (diff)
downloadmariadb-git-ef2b4b14e1a917a18b059b49514b7974027d897d.tar.gz
Merge from 5.2
Diffstat (limited to 'sql/records.cc')
-rw-r--r--sql/records.cc9
1 files changed, 0 insertions, 9 deletions
diff --git a/sql/records.cc b/sql/records.cc
index 5ce7d8660e9..60c801f8977 100644
--- a/sql/records.cc
+++ b/sql/records.cc
@@ -195,15 +195,6 @@ bool init_read_record(READ_RECORD *info,THD *thd, TABLE *table,
if (select && my_b_inited(&select->file))
tempfile= &select->file;
- else if (select && select->quick && select->quick->clustered_pk_range())
- {
- /*
- In case of QUICK_INDEX_MERGE_SELECT with clustered pk range we have to
- use its own access method(i.e QUICK_INDEX_MERGE_SELECT::get_next()) as
- sort file does not contain rowids which satisfy clustered pk range.
- */
- tempfile= 0;
- }
else
tempfile= table->sort.io_cache;
if (tempfile && my_b_inited(tempfile) &&