hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2019-06-26 10:10:26 +03:00
parent 67d82146f1 d15582d26d
commit 6cc0d43cb2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxscale-system-test/mariadb_nodes.cpp
View File

@ -179,11 +179,11 @@ void Mariadb_nodes::read_env()
// reading start_db_command // reading start_db_command
sprintf(env_name, "%s_%03d_start_db_command", prefix, i); sprintf(env_name, "%s_%03d_start_db_command", prefix, i);
start_db_command[i] = readenv(env_name, (char *) "service mysql start"); start_db_command[i] = readenv(env_name, (char *) "systemctl start mariadb || service mysql start");
// reading stop_db_command // reading stop_db_command
sprintf(env_name, "%s_%03d_stop_db_command", prefix, i); sprintf(env_name, "%s_%03d_stop_db_command", prefix, i);
stop_db_command[i] = readenv(env_name, (char *) "service mysql stop"); stop_db_command[i] = readenv(env_name, (char *) "systemctl stop mariadb || service mysql stop");
// reading cleanup_db_command // reading cleanup_db_command
sprintf(env_name, "%s_%03d_cleanup_db_command", prefix, i); sprintf(env_name, "%s_%03d_cleanup_db_command", prefix, i);