From e5f521696ee546f42e6014e573579f3bafa85fac Mon Sep 17 00:00:00 2001 From: Christoph Galuschka Date: Dec 29 2013 11:24:29 +0000 Subject: Merge commit 'refs/merge-requests/47' of git://gitorious.org/testautomation/t_functional into merge-requests/47 --- diff --git a/tests/p_php/20-php-mysql-test.sh b/tests/p_php/20-php-mysql-test.sh index edaaa7e..23f4497 100755 --- a/tests/p_php/20-php-mysql-test.sh +++ b/tests/p_php/20-php-mysql-test.sh @@ -14,10 +14,15 @@ if [ $centos_ver = 5 ] then t_InstallPackage mysql-server mysql55-mysql-server nc t_ServiceControl mysql55-mysqld stop -else + t_ServiceControl mysqld start >/dev/null 2>&1 +elif [ $centos_ver = 6 ] +then t_InstallPackage mysql-server nc + t_ServiceControl mysqld start >/dev/null 2>&1 +else + t_InstallPackage mariadb-server nc + t_ServiceControl mariadb start >/dev/null 2>&1 fi -t_ServiceControl mysqld start >/dev/null 2>&1 #create a little DB to use CREATE='/var/tmp/mysql-php-QA.sql'