summaryrefslogtreecommitdiff
path: root/sql/sql_join_cache.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-09-25 21:45:44 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-09-25 21:45:44 +0300
commit86c3ba65aa39e1e81c52f3455a1bcf187906dffc (patch)
treef01b4163c1a230d77d44b6963c6c4ae9c3b8f38f /sql/sql_join_cache.cc
parent80b9ce359312c1520623531bf173ee048317fee3 (diff)
parent742263df4f43ac8ffb611de607fb8337296ae949 (diff)
downloadmariadb-git-86c3ba65aa39e1e81c52f3455a1bcf187906dffc.tar.gz
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'sql/sql_join_cache.cc')
-rw-r--r--sql/sql_join_cache.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc
index 12c64caa225..5a11bb82cbe 100644
--- a/sql/sql_join_cache.cc
+++ b/sql/sql_join_cache.cc
@@ -3862,6 +3862,7 @@ int JOIN_TAB_SCAN_MRR::open()
/* Dynamic range access is never used with BKA */
DBUG_ASSERT(join_tab->use_quick != 2);
+ join_tab->tracker->r_scans++;
save_or_restore_used_tabs(join_tab, FALSE);
init_mrr_buff();
@@ -3905,6 +3906,8 @@ int JOIN_TAB_SCAN_MRR::next()
int rc= join_tab->table->file->multi_range_read_next((range_id_t*)ptr) ? -1 : 0;
if (!rc)
{
+ join_tab->tracker->r_rows++;
+ join_tab->tracker->r_rows_after_where++;
/*
If a record in in an incremental cache contains no fields then the
association for the last record in cache will be equal to cache->end_pos