#At file:///home/tsk/mprog/src/5.3/ based on revid:timour@askmonty.org-20100716110215-toh8erf6p93d1n6i 2806 timour@askmonty.org 2010-07-23 Removed dead code that was made obsolete by the introduction of check_join_cache_usage() by the change: Revno: 2793 Revision Id: igor@askmonty.org-20091221022615-kx5ieiu0okmiupuc Timestamp: Sun 2009-12-20 18:26:15 -0800 Backport into MariaDB-5.2 the following: WL#2771 "Block Nested Loop Join and Batched Key Access Join" modified: sql/sql_select.cc === modified file 'sql/sql_select.cc' --- a/sql/sql_select.cc 2010-07-15 13:59:10 +0000 +++ b/sql/sql_select.cc 2010-07-23 08:25:00 +0000 @@ -7560,7 +7560,6 @@ make_join_readinfo(JOIN *join, ulonglong { uint i; bool statistics= test(!(join->select_options & SELECT_DESCRIBE)); - bool ordered_set= 0; bool sorted= 1; uint first_sjm_table= MAX_TABLES; uint last_sjm_table= MAX_TABLES; @@ -7580,21 +7579,6 @@ make_join_readinfo(JOIN *join, ulonglong tab->read_record.file=table->file; tab->read_record.unlock_row= rr_unlock_row; tab->next_select=sub_select; /* normal select */ - - /* - Determine if the set is already ordered for ORDER BY, so it can - disable join cache because it will change the ordering of the results. - Code handles sort table that is at any location (not only first after - the const tables) despite the fact that it's currently prohibited. - We must disable join cache if the first non-const table alone is - 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->sort_by_table == (TABLE *) 1 && i != join->const_tables))) - ordered_set= 1; - tab->sorted= sorted; sorted= 0; // only first must be sorted if (tab->loosescan_match_tab)