database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0

Browse Source 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
This commit is contained in:
gkodinov@dl145s.mysql.com
2006-09-28 10:36:04 +02:00
parent 4aaf7e34ff 903387afc0
commit b0167d265f
24 changed files with 446 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.cc
View File

@@ -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)
{