diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-29 16:24:21 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-29 16:24:21 -0400 |
| commit | c681d06f9b1b7a826008303b74ef48fe118fe0e4 (patch) | |
| tree | 8a4347a8719a65a224b41a0ad3bdb5931f264204 /sql/sql_select.cc | |
| parent | 90a29133a51d1eb7c4f142c68c68df61a0baf163 (diff) | |
| parent | 04bf9cc7c6f17d9c6ab14a7521c1ab1708f50993 (diff) | |
| download | mariadb-git-c681d06f9b1b7a826008303b74ef48fe118fe0e4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index ac4b404ce8e..b328d9162d5 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -11735,8 +11735,6 @@ 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) { |