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