diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-25 13:46:54 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-25 13:46:54 +0300 |
| commit | 7dcb8816a1ef080fae588f75e504859087d91aec (patch) | |
| tree | 286a7c17f5651ca9f7aa306080a28b5677cb0f91 /sql/sql_join_cache.cc | |
| parent | 8acb2b7b28d58689071d8adec4e41074a17d6c0f (diff) | |
| parent | 84be33abe010afa07c8cfe24d4c44be5d117ed22 (diff) | |
| download | mariadb-git-7dcb8816a1ef080fae588f75e504859087d91aec.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_join_cache.cc')
| -rw-r--r-- | sql/sql_join_cache.cc | 3 |
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 |