database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge polly.(none):/home/kaa/src/opt/bug30666/my50-bug29131

Browse Source 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
This commit is contained in:
kaa@polly.(none)
2007-11-12 12:29:20 +03:00
parent 3847b1b2eb 4aa0402224
commit bf2a90f14b
3 changed files with 78 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_select.cc
View File

@ -6088,10 +6088,9 @@ make_join_readinfo(JOIN *join, ulonglong options)
ordered. If there is a temp table the ordering is done as a last
operation and doesn't prevent join cache usage.
*/
if (!ordered_set && !join->need_tmp &&
((table == join->sort_by_table &&
(!join->order || join->skip_sort_order)) ||
(join->sort_by_table == (TABLE *) 1 && i != join->const_tables)))
if (!ordered_set && !join->need_tmp &&
(table == join->sort_by_table ||
(join->sort_by_table == (TABLE *) 1 && i != join->const_tables)))
ordered_set= 1;
switch (tab->type) {