diff options
| author | unknown <sanja@askmonty.org> | 2011-07-21 13:15:09 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2011-07-21 13:15:09 +0300 |
| commit | f675536aa48fd314ade0ee1ed56a44d4558642b4 (patch) | |
| tree | 3fd031f88ec93de785a134844a5d1233713fd8e0 /sql/records.cc | |
| parent | 30370ee2f040d76fd4122fdb34de807a5b82f2c8 (diff) | |
| parent | ee06e4d65e42d303389605f3d30cbf0892be96af (diff) | |
| download | mariadb-git-f675536aa48fd314ade0ee1ed56a44d4558642b4.tar.gz | |
Merge 5.1->5.2
Diffstat (limited to 'sql/records.cc')
| -rw-r--r-- | sql/records.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sql/records.cc b/sql/records.cc index 6bb7c7cffa1..bdb27322a28 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) && |