Fixed default_storage_engine.test

The bug was that the script tried to start mysqld while there was already a running mysqld server. Fixed by killing the running one.
MariaDB · Apr 23, 2020 · d1c3342 · d1c3342
1 parent 88cf6f1
commit d1c3342
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/mysql-test/main/default_storage_engine.result b/mysql-test/main/default_storage_engine.result
@@ -1 +1,3 @@
+# Kill the server
 "all ok"
+# restart
diff --git a/mysql-test/main/default_storage_engine.test b/mysql-test/main/default_storage_engine.test
@@ -5,6 +5,8 @@ if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'in
 
 let $cmd=`select replace("$MYSQLD_BOOTSTRAP_CMD --skip-innodb", " --default-storage-engine=myisam", "")`;
 
+--source include/kill_mysqld.inc
+
 #
 # Now it *must* fail, because if InnoDB is compiled in, it is used as a default
 # storage engine. but $cmd includes --skip-innodb
@@ -14,3 +16,4 @@ exec $cmd;
 
 echo "all ok"; # to not have zero-length result file
 
+--source include/start_mysqld.inc