Merge 10.4 into 10.5

2 files changed, 3 insertions, 10 deletions

diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc
index 85daf649c6a..a16ee95dc83 100644
--- a/storage/innobase/trx/trx0roll.cc
+++ b/storage/innobase/trx/trx0roll.cc
@@ -67,7 +67,7 @@ inline bool trx_t::rollback_finish()
   }
 
   ut_a(error_state == DB_INTERRUPTED);
-  ut_ad(!srv_is_being_started);
+  ut_ad(srv_shutdown_state != SRV_SHUTDOWN_NONE);
   ut_a(!srv_undo_sources);
   ut_ad(srv_fast_shutdown);
   ut_d(in_rollback= false);
@@ -145,9 +145,6 @@ inline void trx_t::rollback_low(trx_savept_t *savept)
 
   mem_heap_free(heap);
 
-  /* There might be work for utility threads.*/
-  srv_active_wake_master_thread();
-
   MONITOR_DEC(MONITOR_TRX_ACTIVE);
 }
 
@@ -776,7 +773,8 @@ void trx_rollback_recovered(bool all)
     ut_ad(trx_state_eq(trx, TRX_STATE_ACTIVE));
     ut_d(trx_mutex_exit(trx));
 
-    if (!srv_is_being_started && !srv_undo_sources && srv_fast_shutdown)
+    if (srv_shutdown_state != SRV_SHUTDOWN_NONE && !srv_undo_sources &&
+        srv_fast_shutdown)
       goto discard;
 
     if (all || trx_get_dict_operation(trx) != TRX_DICT_OP_NONE)
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc
index fb594b0b099..ac9fc7d22c2 100644
--- a/storage/innobase/trx/trx0trx.cc
+++ b/storage/innobase/trx/trx0trx.cc
@@ -1469,11 +1469,6 @@ inline void trx_t::commit_in_memory(const mtr_t *mtr)
       must_flush_log_later= true;
     else if (srv_flush_log_at_trx_commit)
       trx_flush_log_if_needed(commit_lsn, this);
-
-    /* Tell server some activity has happened, since the trx does
-    changes something. Background utility threads like master thread,
-    purge thread or page_cleaner thread might have some work to do. */
-    srv_active_wake_master_thread();
   }
 
   ut_ad(!rsegs.m_noredo.undo);