database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Fixed default_storage_engine.test

Browse Source 
The bug was that the script tried to start mysqld while there was already
a running mysqld server. Fixed by killing the running one.
This commit is contained in:
Monty
2020-04-23 11:08:52 +03:00
parent 88cf6f1c7f
commit d1c3342d07
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/default_storage_engine.result
View File

@@ -1 +1,3 @@
# Kill the server
"all ok" "all ok"
# restart

3
mysql-test/main/default_storage_engine.test
View File

@@ -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;
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