database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge

Browse Source
This commit is contained in:
Igor Babaev
2011-01-14 23:53:27 -08:00
parent 7fd3c9e2ff 0aebdc115f
commit 92f2392eb5
5 changed files with 276 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_join_cache.cc
View File

@@ -3179,7 +3179,8 @@ uint JOIN_CACHE_HASHED::get_next_key(uchar ** key)
int JOIN_TAB_SCAN::open()
{
for (JOIN_TAB *tab= join->join_tab; tab != join_tab ; tab++)
JOIN_TAB *bound= join_tab-cache->tables;
for (JOIN_TAB *tab= join_tab-1; tab != bound && !tab->cache; tab--)
{
tab->status= tab->table->status;
tab->table->status= 0;
@@ -3254,7 +3255,8 @@ int JOIN_TAB_SCAN::next()
void JOIN_TAB_SCAN::close()
{
for (JOIN_TAB *tab= join->join_tab; tab != join_tab ; tab++)
JOIN_TAB *bound= join_tab-cache->tables;
for (JOIN_TAB *tab= join_tab-1; tab != bound && !tab->cache; tab--)
tab->table->status= tab->status;
}
@@ -3655,7 +3657,8 @@ int JOIN_TAB_SCAN_MRR::open()
/* Dynamic range access is never used with BKA */
DBUG_ASSERT(join_tab->use_quick != 2);
for (JOIN_TAB *tab =join->join_tab; tab != join_tab ; tab++)
JOIN_TAB *bound= join_tab-cache->tables;
for (JOIN_TAB *tab= join_tab-1; tab != bound && !tab->cache; tab--)
{
tab->status= tab->table->status;
tab->table->status= 0;