Follow-up to Bug#19514950 CLEAN UP TESTS THAT KILL OR RESTART THE SERVER

Remove the file mysql-test/include/restart_readonly_mysqld.inc
and use restart_mysqld.inc instead.

Reviewed-by: Jimmy Yang <[email protected]>

Author: Marko Mäkelä

mysql-test/include/restart_readonly_mysqld.inc

@@ -5,6 +5,7 @@ CREATE TABLE t1(a int PRIMARY KEY) ENGINE=InnoDB;
 CREATE TABLE t2(b int PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES(1);
 INSERT INTO t2 VALUES(2);
+# restart: --innodb-read-only
 UPDATE t1,t2 SET t1.a = 2, t2.b = 2 WHERE t1.a = 1;
 ERROR HY000: Table 't1' is read only
 # restart

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

@@ -12,8 +12,8 @@ CREATE TABLE t2(b int PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES(1);
 INSERT INTO t2 VALUES(2);
 
-# Restart the server in readonly mode
---source include/restart_readonly_mysqld.inc
+let $restart_parameters = restart: --innodb-read-only;
+--source include/restart_mysqld.inc
 
 --error ER_OPEN_AS_READONLY
 UPDATE t1,t2 SET t1.a = 2, t2.b = 2 WHERE t1.a = 1;