diff options
| author | Monty <monty@mariadb.org> | 2020-04-23 11:08:52 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-04-23 11:08:52 +0300 |
| commit | d1c3342d07dbf56dc355b9e61efc3938807bcb3a (patch) | |
| tree | bde94e5295d3e04cd21dcd8bf6b85e4eba308c72 | |
| parent | 88cf6f1c7ff5d56138c8b53a5adaca4c61752f86 (diff) | |
| download | mariadb-git-d1c3342d07dbf56dc355b9e61efc3938807bcb3a.tar.gz | |
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.
| -rw-r--r-- | mysql-test/main/default_storage_engine.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/default_storage_engine.test | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/main/default_storage_engine.result b/mysql-test/main/default_storage_engine.result index da3350c6eaf..38b867c8337 100644 --- 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 index dd6f4728f47..3609b344cca 100644 --- 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 |