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

Post-merge fixes part 4

Browse Source
This commit is contained in:
Sergey Petrunya
2011-02-16 13:26:27 +03:00
parent db7461783e
commit 716091e2a0
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_join_cache.cc
View File

@@ -923,7 +923,7 @@ int JOIN_CACHE::alloc_buffer()
//psergey-merge: for (tab= join->join_tab+join->const_tables; tab <= join_tab; tab++) //psergey-merge: for (tab= join->join_tab+join->const_tables; tab <= join_tab; tab++)
// for (tab= cache->join_tab-cache->tables; tab < cache->join_tab ; tab++) // for (tab= cache->join_tab-cache->tables; tab < cache->join_tab ; tab++)
// (fixed) // (fixed)
for (tab= join->join_tab + join->const_tables; tab!= join_tab; for (tab= /*join->join_tab + join->const_tables*/ start_tab; tab!= join_tab;
tab= next_linear_tab(join, tab, FALSE)) tab= next_linear_tab(join, tab, FALSE))
{ {
cache= tab->cache; cache= tab->cache;

15
sql/sql_select.cc
View File

@@ -8429,10 +8429,12 @@ void check_join_cache_usage_for_tables(JOIN *join, ulonglong options,
if (!(tab >= first_sjm_table && tab < last_sjm_table)) if (!(tab >= first_sjm_table && tab < last_sjm_table))
tab->first_sjm_sibling= NULL; tab->first_sjm_sibling= NULL;
#endif #endif
JOIN_TAB *prev_tab;
restart:
tab->icp_other_tables_ok= TRUE; tab->icp_other_tables_ok= TRUE;
tab->idx_cond_fact_out= TRUE; tab->idx_cond_fact_out= TRUE;
JOIN_TAB *prev_tab= tab - 1; prev_tab= tab - 1;
if ((tab->bush_root_tab && tab->bush_root_tab->bush_children->start == tab)) if ((tab->bush_root_tab && tab->bush_root_tab->bush_children->start == tab))
prev_tab= NULL; prev_tab= NULL;
@@ -8450,11 +8452,20 @@ void check_join_cache_usage_for_tables(JOIN *join, ulonglong options,
// tab-1); // tab-1);
prev_tab); prev_tab);
tab->use_join_cache= test(tab->used_join_cache_level); tab->use_join_cache= test(tab->used_join_cache_level);
DBUG_ASSERT(!join->return_tab); /*
psergey-merge: todo: raise the question that this is really stupid that
we can first allocate a join buffer, then decide not to use it and free
it.
*/
/* /*
if (join->return_tab) if (join->return_tab)
i= join->return_tab-join->join_tab-1; // always >= 0 i= join->return_tab-join->join_tab-1; // always >= 0
*/ */
if (join->return_tab)
{
tab= join->return_tab;
goto restart;
}
break; break;
default: default:
tab->used_join_cache_level= 0; tab->used_join_cache_level= 0;