Commit d1c3342d authored by Monty's avatar Monty

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.
parent 88cf6f1c
# Kill the server
"all ok" "all ok"
# restart
...@@ -5,6 +5,8 @@ if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'in ...@@ -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", "")`; 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 # Now it *must* fail, because if InnoDB is compiled in, it is used as a default
# storage engine. but $cmd includes --skip-innodb # storage engine. but $cmd includes --skip-innodb
...@@ -14,3 +16,4 @@ exec $cmd; ...@@ -14,3 +16,4 @@ exec $cmd;
echo "all ok"; # to not have zero-length result file echo "all ok"; # to not have zero-length result file
--source include/start_mysqld.inc
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment