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

5.3 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2012-02-24 14:37:00 +01:00
parent db39910f08 c068b831ac
commit 3f28115e0e
35 changed files with 351 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_join_cache.cc
View File

@ -4027,9 +4027,9 @@ bool bka_skip_index_tuple(range_seq_t rseq, range_id_t range_info)
JOIN_CACHE_BKA *cache= (JOIN_CACHE_BKA *) rseq;
THD *thd= cache->thd();
bool res;
status_var_increment(thd->status_var.ha_pushed_index_cond_checks);
if ((res= cache->skip_index_tuple(range_info)))
status_var_increment(thd->status_var.ha_pushed_index_cond_filtered);
status_var_increment(thd->status_var.ha_icp_attempts);
if (!(res= cache->skip_index_tuple(range_info)))
status_var_increment(thd->status_var.ha_icp_match);
DBUG_RETURN(res);
}
@ -4506,9 +4506,9 @@ bool bkah_skip_index_tuple(range_seq_t rseq, range_id_t range_info)
JOIN_CACHE_BKAH *cache= (JOIN_CACHE_BKAH *) rseq;
THD *thd= cache->thd();
bool res;
status_var_increment(thd->status_var.ha_pushed_index_cond_checks);
if ((res= cache->skip_index_tuple(range_info)))
status_var_increment(thd->status_var.ha_pushed_index_cond_filtered);
status_var_increment(thd->status_var.ha_icp_attempts);
if (!(res= cache->skip_index_tuple(range_info)))
status_var_increment(thd->status_var.ha_icp_match);
DBUG_RETURN(res);
}