Fix assertion with --innodb-sync-debug=ON

srv_purge_wakeup() is called under protection of latch in purge_sys_t::resume() move sync check code before acquiring that latch.
MariaDB · Jan 12, 2020 · 1bbb67b · 1bbb67b
1 parent bada05a
commit 1bbb67b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
@@ -2290,8 +2290,6 @@ void
 srv_purge_wakeup()
 {
 	ut_ad(!srv_read_only_mode);
-	ut_ad(!sync_check_iterate(sync_check()));
-
 	if (srv_force_recovery >= SRV_FORCE_NO_BACKGROUND) {
 		return;
 	}

diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc
@@ -1349,7 +1349,7 @@ void purge_sys_t::resume()
      ut_ad(!srv_undo_sources);
      return;
    }
-
+   ut_ad(!sync_check_iterate(sync_check()));
    rw_lock_x_lock(&latch);
    int32_t paused= m_paused--;
    ut_a(paused);