From b44ea837b9ee0fcc70ca4abc315a4cbbc94eed99 Mon Sep 17 00:00:00 2001
From: Timofey Turenko <timofey.turenko@mariadb.com>
Date: Wed, 21 Nov 2018 13:39:01 +0200
Subject: [PATCH] do not use ssh to check MariaDB server start command

maxscale-system-test/set_env.sh script is slow because it checks if MariaDB start command is mysql or mysqld
Now all versions can be started with 'mysql' except MySQL 5.5 which is not supported
---
 maxscale-system-test/mdbci/set_env.sh | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/maxscale-system-test/mdbci/set_env.sh b/maxscale-system-test/mdbci/set_env.sh
index 46893015d..0e46748b7 100644
--- a/maxscale-system-test/mdbci/set_env.sh
+++ b/maxscale-system-test/mdbci/set_env.sh
@@ -52,29 +52,8 @@ do
 
 		start_cmd_var="$prefix"_"$num"_start_db_command
 		stop_cmd_var="$prefix"_"$num"_stop_db_command
-		mysql_exe=`${mdbci_dir}/mdbci ssh --command 'ls /etc/init.d/mysql* 2> /dev/null | tr -cd "[:print:]"' $config_name/node_$num  --silent 2> /dev/null`
-		echo $mysql_exe | grep -i "mysql"
-		if [ $? != 0 ] ; then
-			service_name=`${mdbci_dir}/mdbci ssh --command 'systemctl list-unit-files | grep mysql' $config_name/node_$num  --silent`
-			echo $service_name | grep mysql
-			if [ $? == 0 ] ; then
-				echo $service_name | grep mysqld
-				if [ $? == 0 ] ; then
-		                        eval 'export $start_cmd_var="service mysqld start "'
-	        	                eval 'export $stop_cmd_var="service mysqld stop  "'
-				else
-	                        	eval 'export $start_cmd_var="service mysql start "'
-	        	                eval 'export $stop_cmd_var="service mysql stop  "'
-				fi
-			else
-				${mdbci_dir}/mdbci ssh --command 'echo \"/usr/sbin/mysqld \$* 2> stderr.log > stdout.log &\" > mysql_start.sh; echo \"sleep 20\" >> mysql_start.sh; echo \"disown\" >> mysql_start.sh; chmod a+x mysql_start.sh' $config_name/node_$num --silent
-        	                eval 'export $start_cmd_var="/home/$au/mysql_start.sh "'
-				eval 'export $stop_cmd_var="killall mysqld "'
-			fi
-		else
-			eval 'export $start_cmd_var="$mysql_exe start "'
-			eval 'export $stop_cmd_var="$mysql_exe stop "'
-		fi
+                eval 'export $start_cmd_var="service mysql start "'
+                eval 'export $stop_cmd_var="service mysql stop  "'
 
 		eval 'export "$prefix"_"$num"_start_vm_command="cd ${MDBCI_VM_PATH}/$config_name;vagrant resume ${prefix}_$num ; cd $curr_dir"'
 		eval 'export "$prefix"_"$num"_stop_vm_command="cd ${MDBCI_VM_PATH}/$config_name;vagrant suspend ${prefix}_$num ; cd $curr_dir"'