diff options
| author | unknown <gkodinov/kgeorge@rakia.(none)> | 2006-08-15 12:54:02 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@rakia.(none)> | 2006-08-15 12:54:02 +0300 |
| commit | 5bf943a95dd0db5e070cc546cf8d427aed83308c (patch) | |
| tree | 839361d45c65d947961b12aefdf2ad122f095fe2 /sql/sql_select.cc | |
| parent | a0474a811c066d132692db111c3f8c85d5dafb77 (diff) | |
| parent | fd65e53a8ab8a152d7f5ba2b4459673b7132d389 (diff) | |
| download | mariadb-git-5bf943a95dd0db5e070cc546cf8d427aed83308c.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into rakia.(none):/home/kgeorge/mysql/autopush/B21159-5.0-opt
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 5c5516374f2..f1f51bcc95a 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -11518,6 +11518,8 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit, We must not try to use disabled keys. */ usable_keys= table->s->keys_in_use; + /* we must not consider keys that are disabled by IGNORE INDEX */ + usable_keys.intersect(table->keys_in_use_for_query); for (ORDER *tmp_order=order; tmp_order ; tmp_order=tmp_order->next) { |