merge 5.1 => 5.5

8d8b5ab5 · Tor Didriksen · 656cf87c · 134e2480 · 8d8b5ab5
Commit 8d8b5ab5 authored Feb 07, 2013 by Tor Didriksen
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/sql_select.cc sql/sql_select.cc +2 -1

No files found.
--- 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