database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2023-08-24 10:16:24 +03:00
parent 4e7d2e73c0 aeb8eae5c8
commit eda75cadea
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/innodb/r/read_only_recovery.result
View File

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

1
mysql-test/suite/innodb/t/read_only_recovery.test
View File

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

2
storage/innobase/handler/ha_innodb.cc
View File

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

2
storage/innobase/srv/srv0srv.cc
View File

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