diff --git a/sql/binlog.cc b/sql/binlog.cc
index 2510a5c..a771d03 100644
--- a/sql/binlog.cc
+++ b/sql/binlog.cc
@@ -2325,7 +2325,8 @@ Stage_manager::Mutex_queue::pop_front()
 
 
 bool
-Stage_manager::enroll_for(StageID stage, THD *thd, mysql_mutex_t *stage_mutex)
+Stage_manager::enroll_for(StageID stage, THD *thd, mysql_mutex_t *stage_mutex,
+                          mysql_mutex_t *enter_mutex)
 {
   // If the queue was empty: we're the leader for this batch
   DBUG_PRINT("debug", ("Enqueue 0x%llx to queue for stage %d",
@@ -2340,6 +2341,15 @@ Stage_manager::enroll_for(StageID stage, THD *thd, mysql_mutex_t *stage_mutex)
     mngr->unregister_trx(worker);
   }
 
+  if (leader) {
+    bool need_lock_enter_mutex=
+      !(mysql_bin_log.is_rotating_caused_by_incident &&
+        enter_mutex == mysql_bin_log.get_log_lock());
+
+    if (need_lock_enter_mutex)
+      mysql_mutex_lock(enter_mutex);
+  }
+
   /*
     We do not need to unlock the stage_mutex if it is LOCK_log when rotating
     binlog caused by logging incident log event, since it should be held
@@ -9208,23 +9218,13 @@ MYSQL_BIN_LOG::change_stage(THD *thd MY_ATTRIBUTE((unused)),
     enroll_for will release the leave_mutex once the sessions are
     queued.
   */
-  if (!stage_manager.enroll_for(stage, queue, leave_mutex))
+  if (!stage_manager.enroll_for(stage, queue, leave_mutex, enter_mutex))
   {
     DBUG_ASSERT(!thd_get_cache_mngr(thd)->dbug_any_finalized());
     DBUG_RETURN(true);
   }
 
-  /*
-    We do not lock the enter_mutex if it is LOCK_log when rotating binlog
-    caused by logging incident log event, since it is already locked.
-  */
-  bool need_lock_enter_mutex=
-    !(is_rotating_caused_by_incident && enter_mutex == &LOCK_log);
-
-  if (need_lock_enter_mutex)
-    mysql_mutex_lock(enter_mutex);
-  else
-    mysql_mutex_assert_owner(enter_mutex);
+  mysql_mutex_assert_owner(enter_mutex);
 
   DBUG_RETURN(false);
 }
diff --git a/sql/binlog.h b/sql/binlog.h
index b701732..19129e0 100644
--- a/sql/binlog.h
+++ b/sql/binlog.h
@@ -223,7 +223,8 @@ public:
     @retval true  Thread is stage leader.
     @retval false Thread was not stage leader and processing has been done.
    */
-  bool enroll_for(StageID stage, THD *first, mysql_mutex_t *stage_mutex);
+  bool enroll_for(StageID stage, THD *first, mysql_mutex_t *stage_mutex,
+                  mysql_mutex_t *enter_mutex);
 
   std::pair<bool,THD*> pop_front(StageID stage)
   {