summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb/t/innodb-blob.test
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-03-12 11:18:51 +0100
committerSergei Golubchik <serg@mariadb.org>2017-03-31 19:28:58 +0200
commitd6d994bf42be0b855e3eb1c4d672a4871a186652 (patch)
treef59e6bc257a0d5a5e70920427750021396ac5c09 /mysql-test/suite/innodb/t/innodb-blob.test
parent143e771deef47e4afdd5d8dcdaddc424f919af83 (diff)
downloadmariadb-git-d6d994bf42be0b855e3eb1c4d672a4871a186652.tar.gz
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.
Diffstat (limited to 'mysql-test/suite/innodb/t/innodb-blob.test')
-rw-r--r--mysql-test/suite/innodb/t/innodb-blob.test9
1 files changed, 6 insertions, 3 deletions
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;