Commit 56d1810d authored by unknown's avatar unknown
Browse files

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into mysql.com:/home/psergey/mysql-5.1-look
parents fc6416fc c7d335a7

sql/opt_range.cc

+6 −3
Original line number Diff line number Diff line
@@ -1951,9 +1951,12 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use, 
          read_time= (double) HA_POS_ERROR;

          goto free_mem;

        }

        if (tree->type != SEL_TREE::KEY &&

            tree->type != SEL_TREE::KEY_SMALLER)

          goto free_mem;

        /*

          If the tree can't be used for range scans, proceed anyway, as we

          can construct a group-min-max quick select

        */

        if (tree->type != SEL_TREE::KEY && tree->type != SEL_TREE::KEY_SMALLER)

          tree= NULL;

      }

    }