diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-08 14:31:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-08 14:31:59 +0300 |
| commit | f8041b170453465d87ed90ee5e02cf66cd6c6f77 (patch) | |
| tree | 00830942862c7b459506663c692149a67cfb1d68 | |
| parent | ce4667579941301bd5a44968420dd505c88fb6d7 (diff) | |
| download | mariadb-git-f8041b170453465d87ed90ee5e02cf66cd6c6f77.tar.gz | |
squash! a55b951e6082a4ce9a1f2ed5ee176ea7dbbaf1f2
buf_flush_try_neighbors(): Tolerate count==0 in case the tablespace
is being dropped.
| -rw-r--r-- | storage/innobase/buf/buf0flu.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc index 8563cc46274..abed2a80182 100644 --- a/storage/innobase/buf/buf0flu.cc +++ b/storage/innobase/buf/buf0flu.cc @@ -1086,13 +1086,11 @@ static ulint buf_flush_try_neighbors(fil_space_t *space, mysql_mutex_unlock(&buf_pool.mutex); } - ut_ad(!bpage); - - if (auto n= count - 1) + if (count > 1) { MONITOR_INC_VALUE_CUMULATIVE(MONITOR_FLUSH_NEIGHBOR_TOTAL_PAGE, MONITOR_FLUSH_NEIGHBOR_COUNT, - MONITOR_FLUSH_NEIGHBOR_PAGES, n); + MONITOR_FLUSH_NEIGHBOR_PAGES, count - 1); } return count; |