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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2019-06-27 08:53:33 +03:00
parent c8145f94c9 5eba688c1b
commit fcc19f3c66
9 changed files with 163 additions and 49 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
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
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
sprintf(env_name, "%s_%03d_cleanup_db_command", prefix, i);