Commit e75fd931 authored by unknown's avatar unknown

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"
parent 2d78ffb8
...@@ -7560,7 +7560,6 @@ make_join_readinfo(JOIN *join, ulonglong options, uint no_jbuf_after) ...@@ -7560,7 +7560,6 @@ make_join_readinfo(JOIN *join, ulonglong options, uint no_jbuf_after)
{ {
uint i; uint i;
bool statistics= test(!(join->select_options & SELECT_DESCRIBE)); bool statistics= test(!(join->select_options & SELECT_DESCRIBE));
bool ordered_set= 0;
bool sorted= 1; bool sorted= 1;
uint first_sjm_table= MAX_TABLES; uint first_sjm_table= MAX_TABLES;
uint last_sjm_table= MAX_TABLES; uint last_sjm_table= MAX_TABLES;
...@@ -7580,21 +7579,6 @@ make_join_readinfo(JOIN *join, ulonglong options, uint no_jbuf_after) ...@@ -7580,21 +7579,6 @@ make_join_readinfo(JOIN *join, ulonglong options, uint no_jbuf_after)
tab->read_record.file=table->file; tab->read_record.file=table->file;
tab->read_record.unlock_row= rr_unlock_row; tab->read_record.unlock_row= rr_unlock_row;
tab->next_select=sub_select; /* normal select */ 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; tab->sorted= sorted;
sorted= 0; // only first must be sorted sorted= 0; // only first must be sorted
if (tab->loosescan_match_tab) if (tab->loosescan_match_tab)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment