From 2692711414c9efc40d1bb7160f75c9776c4c8c0b Mon Sep 17 00:00:00 2001
From: Christoph Galuschka <christoph.galuschka@chello.at>
Date: Nov 09 2013 09:06:08 +0000
Subject: included mysql55 for 5.10 in the remaining tests


---

diff --git a/tests/p_python/20-python-mysql-test.sh b/tests/p_python/20-python-mysql-test.sh
index 8c00469..1368d93 100755
--- a/tests/p_python/20-python-mysql-test.sh
+++ b/tests/p_python/20-python-mysql-test.sh
@@ -5,8 +5,15 @@
 t_Log "Running $0 - python can retrieve mysql-server version information."
 
 # we need a working and running mysql server
-t_InstallPackage mysql-server
-t_ServiceControl mysqld start >/dev/null 2>&1
+# starting with 5.10, we have to differ between mysql55 and mysql
+if [ $centos_ver = 5 ]
+then
+  t_InstallPackage mysql55-mysql-server
+  t_ServiceControl mysql55-mysqld start >/dev/null 2>&1
+else
+  t_InstallPackage mysql-server
+  t_ServiceControl mysqld start >/dev/null 2>&1
+fi
 
 # Installing additional python/mysql module
 t_InstallPackage MySQL-python
diff --git a/tests/r_lamp/0_lamp_install.sh b/tests/r_lamp/0_lamp_install.sh
index debd64f..f6c056c 100755
--- a/tests/r_lamp/0_lamp_install.sh
+++ b/tests/r_lamp/0_lamp_install.sh
@@ -4,7 +4,15 @@
 
 t_Log "Running $0 - attempting to install LAMP stack."
 
-t_InstallPackage httpd mysql-server php
+# MySQL
+# starting with 5.10, we have to differ between mysql55 and mysql
+if [ $centos_ver = 5 ]
+then
+  t_InstallPackage mysql55-mysql-server httpd php
+else
+  t_InstallPackage mysql-server httpd php
+fi
+
 t_ServiceControl httpd stop
 ps ax | grep -v grep | grep -q httpd
 if [ $? = 0 ]
diff --git a/tests/r_lamp/40_basic_lamp.sh b/tests/r_lamp/40_basic_lamp.sh
index 98d1542..c6fe776 100755
--- a/tests/r_lamp/40_basic_lamp.sh
+++ b/tests/r_lamp/40_basic_lamp.sh
@@ -2,8 +2,16 @@
 
 t_Log "Running $0 - install a minimal lamp stack, and test it"
 
-t_InstallPackage httpd mysql mysql-server php php-mysql wget
-t_ServiceControl mysqld restart
+# MySQL
+# starting with 5.10, we have to differ between mysql55 and mysql
+if [ $centos_ver = 5 ]
+then
+  t_InstallPackage mysql55-mysql-server httpd mysql55-mysql php php-mysql wget
+  t_ServiceControl mysql55-mysqld restart
+else
+  t_InstallPackage httpd mysql mysql-server php php-mysql wget
+  t_ServiceControl mysqld restart
+fi
 t_ServiceControl httpd restart
 
 # Initializing a small MySQL db