database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge with 4.0 to get lastest bug fixes

Browse Source
This commit is contained in:
monty@mysql.com
2004-03-29 19:21:53 +03:00
parent 505970b4a7 3cbab63af1
commit dc2f606fb8
14 changed files with 165 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_select.cc
View File

@ -7161,7 +7161,8 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit,
/* check if we can use a key to resolve the group */
/* Tables using JT_NEXT are handled here */
uint nr;
key_map keys;
key_map keys_to_use, keys;
keys_to_use.set_all();
/*
If not used with LIMIT, only use keys if the whole query can be
@ -7169,14 +7170,21 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit,
retrieving all rows through an index.
*/
if (select_limit >= table->file->records)
{
keys=*table->file->keys_to_use_for_scanning();
keys.merge(table->used_keys);
nning();
ified in FORCE INDEX clause,
n ORDER BY.
ry);
}
else
keys.set_all();
keys.intersect(usable_keys);
keys= usable_keys;
for (nr=0; nr < table->keys ; nr++)
{