summaryrefslogtreecommitdiff
path: root/sql/sql_join_cache.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-02-24 14:37:00 +0100
committerSergei Golubchik <sergii@pisem.net>2012-02-24 14:37:00 +0100
commit3f28115e0ee810de2772fdc69d6965058a0b5d2f (patch)
treea14bb01c316d353c5b6c217b7198cf4148ae50e5 /sql/sql_join_cache.cc
parentdb39910f080534159ce8c7d55fa458365de7c3f3 (diff)
parentc068b831aca6334c6dea01fd9ff54b6140a52ef6 (diff)
downloadmariadb-git-3f28115e0ee810de2772fdc69d6965058a0b5d2f.tar.gz
5.3 merge
Diffstat (limited to 'sql/sql_join_cache.cc')
-rw-r--r--sql/sql_join_cache.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc
index f4fe8790bf7..e0e1b175116 100644
--- a/sql/sql_join_cache.cc
+++ b/sql/sql_join_cache.cc
@@ -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);
}