summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-07-23 09:59:16 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-07-23 09:59:16 +0300
commit52ccedd6dd50e8e5cd8ca9b1be84bc5e87c20950 (patch)
tree1013d61224f823847e5ba6c733cc9aeab75e8801 /mysql-test
parentd2982331a62e22ff10fd7768f450303bc90d1caf (diff)
downloadmariadb-git-52ccedd6dd50e8e5cd8ca9b1be84bc5e87c20950.tar.gz
MDEV-23268 SIGSEGV on srv_monitor_event if InnoDB is read-only
The srv_monitor_event and the srv_monitor_thread would not be created when InnoDB is in read-only mode. Yet, some code would unconditionally invoke os_event_set(srv_monitor_event).
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/innodb/r/read_only_recover_committed.result1
-rw-r--r--mysql-test/suite/innodb/t/read_only_recover_committed.test1
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/read_only_recover_committed.result b/mysql-test/suite/innodb/r/read_only_recover_committed.result
index 593bcae40ee..45e9df65819 100644
--- a/mysql-test/suite/innodb/r/read_only_recover_committed.result
+++ b/mysql-test/suite/innodb/r/read_only_recover_committed.result
@@ -26,6 +26,7 @@ a
1
UPDATE t SET a=3 WHERE a=1;
ERROR HY000: Table 't' is read only
+SET GLOBAL innodb_status_output= @@GLOBAL.innodb_status_output;
# Starting with MariaDB 10.2, innodb_read_only implies READ UNCOMMITTED.
# In earlier versions, this would return the last committed version
# (empty table)!
diff --git a/mysql-test/suite/innodb/t/read_only_recover_committed.test b/mysql-test/suite/innodb/t/read_only_recover_committed.test
index 402cbeba1b9..b14aeaee388 100644
--- a/mysql-test/suite/innodb/t/read_only_recover_committed.test
+++ b/mysql-test/suite/innodb/t/read_only_recover_committed.test
@@ -53,6 +53,7 @@ SELECT * FROM t;
UPDATE t SET a=3 WHERE a=1;
--let $restart_parameters= --innodb-read-only
--source include/restart_mysqld.inc
+SET GLOBAL innodb_status_output= @@GLOBAL.innodb_status_output;
--echo # Starting with MariaDB 10.2, innodb_read_only implies READ UNCOMMITTED.
--echo # In earlier versions, this would return the last committed version
--echo # (empty table)!