From d6d994bf42be0b855e3eb1c4d672a4871a186652 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 12 Mar 2017 11:18:51 +0100 Subject: remove two redundant *.inc files to restart a server namely, restart_mysqld_with_option.inc and kill_and_restart_mysqld.inc - use restart_mysqld.inc instead. Also remove innodb_wl6501_crash_stripped.inc that wasn't used anywhere. --- mysql-test/suite/innodb/t/innodb-blob.test | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'mysql-test/suite/innodb/t/innodb-blob.test') diff --git a/mysql-test/suite/innodb/t/innodb-blob.test b/mysql-test/suite/innodb/t/innodb-blob.test index ea50af4a7fc..d2484e2175d 100644 --- a/mysql-test/suite/innodb/t/innodb-blob.test +++ b/mysql-test/suite/innodb/t/innodb-blob.test @@ -70,7 +70,8 @@ SELECT a FROM t1; BEGIN; INSERT INTO t2 VALUES (42); ---source include/kill_and_restart_mysqld.inc +--let $shutdown_timeout=0 +--source include/restart_mysqld.inc disconnect con1; disconnect con2; @@ -138,7 +139,8 @@ SET DEBUG_SYNC='now WAIT_FOR have_latch'; SELECT info FROM information_schema.processlist WHERE state = 'debug sync point: before_row_upd_extern'; ---source include/kill_and_restart_mysqld.inc +--let $shutdown_timeout=0 +--source include/restart_mysqld.inc disconnect con2; connection default; @@ -177,7 +179,8 @@ SET DEBUG_SYNC='now WAIT_FOR have_latch'; SELECT info FROM information_schema.processlist WHERE state = 'debug sync point: after_row_upd_extern'; ---source include/kill_and_restart_mysqld.inc +--let $shutdown_timeout=0 +--source include/restart_mysqld.inc disconnect con2; connection default; -- cgit v1.2.1