Merge lp:~akopytov/percona-xtrabackup/bug1153334-2.1 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

    Bug #1153334: Failing CentOS5-32 builds in Jenkins

    The problem was SELinux preventing relocations in
    ha_innodb_plugin.so.0.0.0 on Centos5-32 slaves in Jenkins. As a result,
    all tests failed in the innodb51 + centos5-32 build configuration.

    Fixed by adding a workaround to testrun.sh so that the corresponding
    library is marked to allow relocations.

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/205/

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

=== modified file 'test/testrun.sh'
--- test/testrun.sh	2013-01-14 11:02:59 +0000
+++ test/testrun.sh	2013-03-11 05:40:40 +0000
@@ -92,6 +92,21 @@
 MYSQL_INSTALL_DB PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH MYSQLDUMP
 }
 
+
+# Fix innodb51 test failures on Centos5-32 Jenkins slaves due to SELinux
+# preventing shared symbol relocations in ha_innodb_plugin.so.0.0.0
+function fix_selinux()
+{
+    if which lsb_release &>/dev/null && \
+        lsb_release -d | grep CentOS &>/dev/null && \
+        lsb_release -r | egrep '5.[0-9]' &>/dev/null && \
+        which chcon &>/dev/null
+    then
+        chcon -t textrel_shlib_t $MYSQL_BASEDIR/lib/plugin/ha_innodb_plugin.so.0.0.0
+    fi
+}
+
+
 function get_version_info()
 {
     MYSQLD_EXTRA_ARGS=
@@ -109,7 +124,9 @@
 		XB_BIN="xtrabackup_51";;
 	    "innodb51" )
 		XB_BIN="xtrabackup_plugin"
-		MYSQLD_EXTRA_ARGS="--ignore-builtin-innodb --plugin-load=innodb=ha_innodb_plugin.so";;
+		MYSQLD_EXTRA_ARGS="--ignore-builtin-innodb --plugin-load=innodb=ha_innodb_plugin.so"
+	        fix_selinux
+		;;
 	    "innodb55" )
 		XB_BIN="xtrabackup_innodb55";;
 	    "xtradb51" | "mariadb51" | "mariadb52" | "mariadb53")