diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2013-02-07 17:08:59 +0100 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2013-02-07 17:08:59 +0100 |
| commit | 84731d897c3ecdd14d44873a9eb8bc5cc7987cdf (patch) | |
| tree | 5d5cb61cdf93341634f122b8a0111f7e5bf44fdf /sql/sql_select.cc | |
| parent | 47f6dc85ea5f4e7d804908a46646d4b03c65847f (diff) | |
| parent | 370ac0669e41a41a6f73850aee0cb3b5675c49b8 (diff) | |
| download | mariadb-git-84731d897c3ecdd14d44873a9eb8bc5cc7987cdf.tar.gz | |
merge 5.1 => 5.5
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 02444c239ec..b2c34134a4a 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -13931,7 +13931,8 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit, if (best_key >= 0) { - if (table->quick_keys.is_set(best_key) && best_key != ref_key) + if (select && + table->quick_keys.is_set(best_key) && best_key != ref_key) { key_map map; map.clear_all(); // Force the creation of quick select |