Merge 10.4 into 10.5

mysql-test/suite/innodb/r/read_only_recovery.result

@@ -35,6 +35,7 @@ SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT * FROM t;
 a
 3
+SET GLOBAL innodb_max_purge_lag_wait=0;
 # restart
 SELECT * FROM t;
 a

mysql-test/suite/innodb/t/read_only_recovery.test

@@ -37,6 +37,7 @@ UPDATE t SET a=3 WHERE a=1;
 SELECT * FROM t;
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT * FROM t;
+SET GLOBAL innodb_max_purge_lag_wait=0;
 --let $restart_parameters=
 --source include/restart_mysqld.inc
 SELECT * FROM t;

storage/innobase/handler/ha_innodb.cc

@@ -223,6 +223,8 @@ static uint innodb_max_purge_lag_wait;
 static void innodb_max_purge_lag_wait_update(THD *thd, st_mysql_sys_var *,
                                              void *, const void *limit)
 {
+  if (high_level_read_only)
+    return;
   const uint l= *static_cast<const uint*>(limit);
   if (trx_sys.rseg_history_len <= l)
     return;

storage/innobase/srv/srv0srv.cc

@@ -1348,8 +1348,6 @@ static tpool::timer *purge_coordinator_timer;
 /** Wake up the purge threads if there is work to do. */
 void srv_wake_purge_thread_if_not_active()
 {
-  ut_ad(!srv_read_only_mode);
-
   if (purge_sys.enabled() && !purge_sys.paused() &&
       (srv_undo_log_truncate || trx_sys.rseg_history_len) &&
       ++purge_state.m_running == 1)

storage/innobase/trx/trx0trx.cc

@@ -1422,7 +1422,6 @@ inline void trx_t::commit_in_memory(const mtr_t *mtr)
   trx_mutex_exit(this);
 
   ut_a(error_state == DB_SUCCESS);
-  if (!srv_read_only_mode)
   srv_wake_purge_thread_if_not_active();
 }