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

[Alexey Kopytov]

    Bug #1190876: Update links to server tarballs in bootstrap.sh

    All kinds of changes, fixes and hacks to update server tarballs in
    bootstrap.sh:

    - links in bootstrap.sh have been updated to use newer server
      tarballs. For PS, we only want to use newer server tarballs on CentOS
      due to bug #1172916. And even on CentOS, we have to use different
      revnos in tarball names depending on the architecture.

    - workaround for bug #1153950 in PS packages: use system mysql client,
      if available.

    - skip test xb_parallel_incremental test when running on server version
      5.6.x where x < 11 due to upstream bug #69780 (XB bug #1203669)

    - fixed bug #1194837: LRU dump tests test expect LRU dump feature in PS
      5.6

    - fixed bug #1194879: bug930062.sh and xb_export.sh expect improved
      table import in PS 5.6

    - fixed bug #1204083: bug795225.sh expects ALL_O_DIRECT support in
      XtraDB 5.6

    - fixed bug #1204085: bug733651.sh expects innodb_fast_checksum in
      XtraDB 5.6

    - fixed bug #1204114: bug930062.sh expects innodb_expand_import in
      XtraDB 5.6

    - skip bug733651 and bug976945 on PS 5.6 due to bug #1194828 (will be
      fixed separately).

    - increased the timeout due to compact_compressed sporadically exceeding
      the current value in debug 5.6 builds

    - added a workaround for Percona Server bug #1204072.

    - other code cleanups

[Alexey Kopytov (akopytov)]

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

[Alexey Kopytov (akopytov)]

Self-approving. Have to merge to meet the release deadlines.

review: Approve

=== modified file 'test/bootstrap.sh'
--- test/bootstrap.sh	2013-04-09 07:24:21 +0000
+++ test/bootstrap.sh	2013-07-25 17:40:36 +0000
@@ -5,15 +5,15 @@
 function usage()
 {
     cat <<EOF
-Usage: 
+Usage:
 $0 xtrabackup_target [installation_directory]
 $0 path_to_server_tarball [installation_directory]
 
 Prepares a server binary directory to be used by run.sh when running XtraBackup
 tests.
 
-If the argument is one of the build targets passed to build.sh 
-(i.e. innodb51 innodb55 innodb56 xtradb51 xtradb55) then the 
+If the argument is one of the build targets passed to build.sh
+(i.e. innodb51 innodb55 innodb56 xtradb51 xtradb55) then the
 appropriate Linux tarball is downloaded from a pre-defined location and
 unpacked into the specified installation  directory ('./server' by default).
 
@@ -41,74 +41,111 @@
 
 case "$1" in
     innodb51)
-	url="http://s3.amazonaws.com/percona.com/downloads/community"
-	tarball="mysql-5.1.49-linux-$arch-glibc23.tar.gz"
-	;;
+        url="http://s3.amazonaws.com/percona.com/downloads/community"
+        tarball="mysql-5.1.70-linux-$arch-glibc23.tar.gz"
+        ;;
 
     innodb55)
-	url="http://s3.amazonaws.com/percona.com/downloads/community"
-	tarball="mysql-5.5.16-linux2.6-$arch.tar.gz"
-	;;
+        url="http://s3.amazonaws.com/percona.com/downloads/community"
+        tarball="mysql-5.5.31-linux2.6-$arch.tar.gz"
+        ;;
 
     innodb56)
         url="http://s3.amazonaws.com/percona.com/downloads/community"
-        tarball="mysql-5.6.10-linux-glibc2.5-$arch.tar.gz"
+        tarball="mysql-5.6.11-linux-glibc2.5-$arch.tar.gz"
         ;;
 
     xtradb51)
-	url="http://www.percona.com/redir/downloads/Percona-Server-5.1/Percona-Server-5.1.67-14.4/binary/linux/$arch"
-	tarball="Percona-Server-5.1.67-rel14.4-511.Linux.$arch.tar.gz"
-	;;
+        if which lsb_release >/dev/null 2>&1 && \
+           ! lsb_release -i | grep -qi centos 
+        then
+            # PS 5.1.69-rel14.7 tarballs are affected by LP bug #1172916
+            # and thus unusable on anything but CentOS
+            url="http://www.percona.com/redir/downloads/Percona-Server-5.1/Percona-Server-5.1.67-14.4/binary/linux/$arch"
+            tarball="Percona-Server-5.1.67-rel14.4-511.Linux.$arch.tar.gz"
+
+        else
+            url="http://s3.amazonaws.com/percona.com/downloads/community"
+            tarball="Percona-Server-5.1.69-rel14.7-572.Linux.$arch.tar.gz"
+        fi
+        ;;
 
     xtradb55)
-	url="http://www.percona.com/redir/downloads/Percona-Server-5.5/Percona-Server-5.5.30-30.1/binary/linux/$arch"
-	tarball="Percona-Server-5.5.30-rel30.1-465.Linux.$arch.tar.gz"
-	;;
+        if which lsb_release >/dev/null 2>&1 && \
+           ! lsb_release -i | grep -qi centos
+        then
+            # PS 5.5.31-rel30.3 tarballs are affected by LP bug #1172916
+            # and thus unusable on anything but CentOS
+            url="http://www.percona.com/redir/downloads/Percona-Server-5.5/Percona-Server-5.5.30-30.1/binary/linux/$arch"
+            tarball="Percona-Server-5.5.30-rel30.1-465.Linux.$arch.tar.gz"
+        else
+            url="http://s3.amazonaws.com/percona.com/downloads/community"
+            tarball="Percona-Server-5.5.31-rel30.3-520.Linux.$arch.tar.gz"
+        fi
+        ;;
 
     xtradb56)
-	url="http://www.percona.com/downloads/TESTING/Percona-Server-56/Percona-Server-5.6.10-alpha60.2/release-5.6.10-60.2/318/binary/linux/$arch"
-	tarball="Percona-Server-5.6.10-alpha60.2-318.Linux.$arch.tar.gz"
-	;;
+        if which lsb_release >/dev/null 2>&1 && \
+           ! lsb_release -i | grep -qi centos
+        then
+            # PS 5.6.11-rc60.3 tarballs are affected by LP bug #1172916
+            # and thus unusable on anything but CentOS
+            url="http://www.percona.com/downloads/TESTING/Percona-Server-56/Percona-Server-5.6.10-alpha60.2/release-5.6.10-60.2/318/binary/linux/$arch"
+            tarball="Percona-Server-5.6.10-alpha60.2-318.Linux.$arch.tar.gz"
+        else
+            url="http://s3.amazonaws.com/percona.com/downloads/community"
+            # PS 5.6.11-rc60.3 tarballs have different revnos for i686 and
+            # x86_64
+            case "$arch" in
+                i686)
+                    tarball="Percona-Server-5.6.11-rc60.3-376.Linux.i686.tar.gz"
+                    ;;
+                *)
+                    tarball="Percona-Server-5.6.11-rc60.3-375.Linux.x86_64.tar.gz"
+                    ;;
+            esac
+        fi
+        ;;
 
     galera55)
-	url="http://www.percona.com/downloads/Percona-XtraDB-Cluster/5.5.24-23.6/binary/linux/$arch"
-	tarball="Percona-XtraDB-Cluster-5.5.24-23.6.342.Linux.$arch.tar.gz"
-	#galera=1
-	;;
+        url="http://www.percona.com/downloads/Percona-XtraDB-Cluster/5.5.24-23.6/binary/linux/$arch"
+        tarball="Percona-XtraDB-Cluster-5.5.24-23.6.342.Linux.$arch.tar.gz"
+        #galera=1
+        ;;
 
     mariadb51)
-	url="ftp://ftp.osuosl.org/pub/mariadb/mariadb-5.1.62/kvm-bintar-hardy-$maria_arch_path"
-	tarball="mariadb-5.1.62-Linux-$arch.tar.gz"
-	;;
+        url="http://s3.amazonaws.com/percona.com/downloads/community"
+        tarball="mariadb-5.1.67-Linux-$arch.tar.gz"
+        ;;
 
     mariadb52)
-	url="ftp://ftp.osuosl.org/pub/mariadb/mariadb-5.2.12/kvm-bintar-hardy-$maria_arch_path"
-	tarball="mariadb-5.2.12-Linux-$arch.tar.gz"
-	;;
+        url="http://s3.amazonaws.com/percona.com/downloads/community"
+        tarball="mariadb-5.2.14-Linux-$arch.tar.gz"
+        ;;
 
     mariadb53)
-	url="ftp://ftp.osuosl.org/pub/mariadb/mariadb-5.3.9/kvm-bintar-hardy-$maria_arch_path"
-	tarball="mariadb-5.3.9-Linux-$arch.tar.gz"
-	;;
+        url="http://s3.amazonaws.com/percona.com/downloads/community"
+        tarball="mariadb-5.3.12-Linux-$arch.tar.gz"
+        ;;
 
     mariadb55)
-	url="ftp://ftp.osuosl.org/pub/mariadb/mariadb-5.5.28/kvm-bintar-hardy-$maria_arch_path"
-	tarball="mariadb-5.5.28-linux-$arch.tar.gz"
-	;;
+        url="http://s3.amazonaws.com/percona.com/downloads/community"
+        tarball="mariadb-5.5.32-linux-$arch.tar.gz"
+        ;;
 
     mariadb100)
-	url="ftp://ftp.osuosl.org/pub/mariadb/mariadb-10.0.1/kvm-bintar-hardy-$maria_arch_path"
-	tarball="mariadb-10.0.1-linux-$arch.tar.gz"
-	;;
+        url="http://s3.amazonaws.com/percona.com/downloads/community"
+        tarball="mariadb-10.0.3-linux-$arch.tar.gz"
+        ;;
 
     *)
-	if ! test -r "$1"
-	then
-	    echo "$1 does not exist"
-	    exit 1
-	fi
-	tarball="$1"
-	;;
+        if ! test -r "$1"
+        then
+            echo "$1 does not exist"
+            exit 1
+        fi
+        tarball="$1"
+        ;;
 esac
 
 if test -n "$2"
@@ -128,22 +165,22 @@
 then
     if test -n "$url"
     then
-	echo "Downloading $tarball"
-	wget -qc "$url/$tarball"
+        echo "Downloading $tarball"
+        wget -qc "$url/$tarball"
     fi
 
     echo "Unpacking $tarball into $destdir"
-    tar zxf $tarball -C $destdir 
+    tar zxf $tarball -C $destdir
     sourcedir="$destdir/`ls $destdir`"
     if test -n "$sourcedir"
     then
-	mv $sourcedir/* $destdir
-	rm -rf $sourcedir
+        mv $sourcedir/* $destdir
+        rm -rf $sourcedir
     fi
 else
     if test ! -d galerabuild
     then
-	bzr init-repo galerabuild
+        bzr init-repo galerabuild
     fi
     cd galerabuild
 
@@ -156,9 +193,9 @@
 
     if test -f /proc/cpuinfo
     then
-	MAKE_J=`grep '^processor' /proc/cpuinfo | wc -l`
+        MAKE_J=`grep '^processor' /proc/cpuinfo | wc -l`
     else
-	MAKE_J=4
+        MAKE_J=4
     fi
 
     make -j$MAKE_J

=== modified file 'test/inc/common.sh'
--- test/inc/common.sh	2013-07-16 05:44:55 +0000
+++ test/inc/common.sh	2013-07-25 17:40:36 +0000
@@ -32,12 +32,22 @@
 
 function call_mysql_install_db()
 {
-	vlog "Calling mysql_install_db"
-	cd $MYSQL_BASEDIR
-	$MYSQL_INSTALL_DB --defaults-file=${MYSQLD_VARDIR}/my.cnf \
-                    --basedir=${MYSQL_BASEDIR} \
-                    ${MYSQLD_EXTRA_ARGS}
-	cd - >/dev/null 2>&1
+        vlog "Calling mysql_install_db"
+
+        cd $MYSQL_BASEDIR
+
+        if ! $MYSQL_INSTALL_DB --defaults-file=${MYSQLD_VARDIR}/my.cnf \
+            --basedir=${MYSQL_BASEDIR} \
+            ${MYSQLD_EXTRA_ARGS}
+        then
+            vlog "mysql_install_db failed. Server log (if exists):"
+            vlog "----------------"
+            cat ${MYSQLD_ERRFILE} >&2 || true
+            vlog "----------------"
+            exit -1
+        fi
+
+        cd - >/dev/null 2>&1
 }
 
 ########################################################################
@@ -612,5 +622,104 @@
     rm -f $file
 }
 
+########################################################################
+# Skip the current test with a given comment
+########################################################################
+function skip_test()
+{
+    echo $1 > $SKIPPED_REASON
+    exit $SKIPPED_EXIT_CODE
+}
+
+########################################################################
+# Get version string in the XXYYZZ version
+########################################################################
+function get_version_str()
+{
+    printf %02d%02d%02d $1 $2 $3
+}
+
+#########################################################################
+# Return 0 if the server version is higher than the first argument
+#########################################################################
+function is_server_version_higher_than()
+{
+    [[ $1 =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]] || \
+        die "Cannot parse server version: '$1'"
+
+    local major=${BASH_REMATCH[1]}
+    local minor=${BASH_REMATCH[2]}
+    local patch=${BASH_REMATCH[3]}
+
+    local server_str=`get_version_str $MYSQL_VERSION_MAJOR \
+$MYSQL_VERSION_MINOR $MYSQL_VERSION_PATCH`
+    local version_str=`get_version_str $major $minor $patch`
+
+    [[ $server_str > $version_str ]]
+}
+
+#########################################################################
+# Require a server version higher than the first argument
+########################################################################
+function require_server_version_higher_than()
+{
+    is_server_version_higher_than $1 || \
+        skip_test "Requires server version higher than $1"
+}
+
+########################################################################
+# Return 0 if the server version is lower than the first argument
+#########################################################################
+function is_server_version_lower_than()
+{
+    [[ $1 =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]] || \
+        die "Cannot parse server version: '$1'"
+
+    local major=${BASH_REMATCH[1]}
+    local minor=${BASH_REMATCH[2]}
+    local patch=${BASH_REMATCH[3]}
+
+    local server_str=`get_version_str $MYSQL_VERSION_MAJOR \
+$MYSQL_VERSION_MINOR $MYSQL_VERSION_PATCH`
+    local version_str=`get_version_str $major $minor $patch`
+
+    [[ $server_str < $version_str ]]
+}
+
+#########################################################################
+# Require a server version lower than the first argument
+########################################################################
+function require_server_version_lower_than()
+{
+    is_server_version_lower_than $1 || \
+        skip_test "Requires server version lower than $1"
+}
+
+########################################################################
+# Return 0 if the server is XtraDB-based
+########################################################################
+function is_xtradb()
+{
+    [ -n "$XTRADB_VERSION" ]
+}
+
+#########################################################################
+# Skip the test if not running against XtraDB
+########################################################################
+function require_xtradb()
+{
+    is_xtradb || skip_test "Requires XtraDB"
+}
+
+########################################################################
+# Skip the test if qpress binary is not available
+########################################################################
+function require_qpress()
+{
+    if ! which qpress > /dev/null 2>&1 ; then
+        skip_test "Requires qpress to be installed"
+    fi
+}
+
 # To avoid unbound variable error when no server have been started
 SRV_MYSQLD_IDS=

=== modified file 'test/inc/ib_incremental_common.sh'
--- test/inc/ib_incremental_common.sh	2013-04-16 10:35:58 +0000
+++ test/inc/ib_incremental_common.sh	2013-07-25 17:40:36 +0000
@@ -1,5 +1,5 @@
 # Expects the following variable to be set before including:
-#    mysqld_extra_args: an extra arg to be passed for all mysqld invocations.  
+#    MYSQLD_EXTRA_MY_CNF_OPTS: an extra arg to be passed for all mysqld invocations.  
 #                       Use this to set special options that influence 
 #                       incremental backups, e.g. turns on log archiving or 
 #                       changed page bitmap output.
@@ -8,9 +8,10 @@
 
 . inc/common.sh
 
-mysqld_extra_args="$mysqld_extra_args --innodb_file_per_table"
+MYSQLD_EXTRA_MY_CNF_OPTS="${MYSQLD_EXTRA_MY_CNF_OPTS:-""}
+innodb_file_per_table"
 
-start_server $mysqld_extra_args
+start_server
 load_dbase_schema incremental_sample
 
 # Adding initial rows
@@ -48,7 +49,7 @@
 
 # Rotate bitmap file here and force checkpoint at the same time
 shutdown_server
-start_server $mysqld_extra_args
+start_server
 
 i=1001
 while [ "$i" -lt "7500" ]
@@ -109,7 +110,7 @@
 innobackupex --copy-back $full_backup_dir
 vlog "Data restored"
 
-start_server $mysqld_extra_args
+start_server
 
 vlog "Checking checksums"
 checksum_test_b=`checksum_table incremental_sample test`

=== modified file 'test/run.sh'
--- test/run.sh	2013-07-24 13:40:08 +0000
+++ test/run.sh	2013-07-25 17:40:36 +0000
@@ -15,7 +15,7 @@
 result=0
 
 # Default test timeout in seconds
-TEST_TIMEOUT=600
+TEST_TIMEOUT=900
 
 # Magic exit code to indicate a skipped test
 export SKIPPED_EXIT_CODE=200
@@ -268,7 +268,14 @@
     find_program MYSQL_INSTALL_DB mysql_install_db $MYSQL_BASEDIR/bin \
 	$MYSQL_BASEDIR/scripts
     find_program MYSQLD mysqld $MYSQL_BASEDIR/bin/ $MYSQL_BASEDIR/libexec
-    find_program MYSQL mysql $MYSQL_BASEDIR/bin
+    # Use the global mysql client binary, if available. This is a workaround for
+    # PS packageing bug LP 1153950
+    if which mysql >/dev/null 2>&1
+    then
+        MYSQL=`which mysql`
+    else
+        find_program MYSQL mysql $MYSQL_BASEDIR/bin
+    fi
     find_program MYSQLADMIN mysqladmin $MYSQL_BASEDIR/bin
     find_program MYSQLDUMP mysqldump $MYSQL_BASEDIR/bin
 
@@ -355,6 +362,14 @@
     MYSQL_VERSION=${MYSQL_VERSION#"version	"}
     MYSQL_VERSION_COMMENT=`$MYSQL ${MYSQL_ARGS} -Nsf -e "SHOW VARIABLES LIKE 'version_comment'"`
     MYSQL_VERSION_COMMENT=${MYSQL_VERSION_COMMENT#"version_comment	"}
+
+    # Split version info into components for easier compatibility checks
+    [[ $MYSQL_VERSION =~ ^([0-9]+)\.([0-9]+)\.([0-9]+) ]] || \
+        die "Cannot parse server version: '$MYSQL_VERSION'"
+    MYSQL_VERSION_MAJOR=${BASH_REMATCH[1]}
+    MYSQL_VERSION_MINOR=${BASH_REMATCH[2]}
+    MYSQL_VERSION_PATCH=${BASH_REMATCH[3]}
+
     INNODB_VERSION=`$MYSQL ${MYSQL_ARGS} -Nsf -e "SHOW VARIABLES LIKE 'innodb_version'"`
     INNODB_VERSION=${INNODB_VERSION#"innodb_version	"}
     XTRADB_VERSION="`echo $INNODB_VERSION  | sed 's/[0-9]\.[0-9]\.[0-9][0-9]*\(-[0-9][0-9]*\.[0-9][0-9]*\)*$/\1/'`"
@@ -384,33 +399,34 @@
     if [ "$XB_BUILD" = "autodetect" ]
     then
         # Determine xtrabackup build automatically
-	if [ "${MYSQL_VERSION:0:3}" = "5.1" ]
-	then
-	    if [ -z "$INNODB_VERSION" ]
-	    then
-		XB_BIN="xtrabackup_51" # InnoDB 5.1 builtin
-	    else
-		XB_BIN="xtrabackup"    # InnoDB 5.1 plugin or Percona Server 5.1
-	    fi
-	elif [ "${MYSQL_VERSION:0:3}" = "5.2" -o "${MYSQL_VERSION:0:3}" = "5.3" ]
-	then
-	    XB_BIN="xtrabackup"
-	elif [ "${MYSQL_VERSION:0:3}" = "5.5" ]
-	then
-	    if [ -n "$XTRADB_VERSION" ]
-	    then
-		XB_BIN="xtrabackup_55"
-	    else
-		XB_BIN="xtrabackup_innodb55"
-	    fi
-        elif [ "${MYSQL_VERSION:0:3}" = "5.6" -o "${MYSQL_VERSION:0:4}" = "10.0" ]
-        then
-            XB_BIN="xtrabackup_56"
-            DEFAULT_IBDATA_SIZE="12M"
-	else
-	    vlog "Unknown MySQL/InnoDB version: $MYSQL_VERSION/$INNODB_VERSION"
-	    exit -1
-	fi
+        case "$MYSQL_VERSION_MAJOR.$MYSQL_VERSION_MINOR" in
+            5.1 )
+                if [ -z "$INNODB_VERSION" ]
+                then
+                    XB_BIN="xtrabackup_51" # InnoDB 5.1 builtin
+                else
+                    XB_BIN="xtrabackup"    # InnoDB 5.1 plugin or Percona Server 5.1
+                fi
+                ;;
+            5.2 | 5.3 )
+                XB_BIN="xtrabackup";;
+            5.5 )
+                if [ -n "$XTRADB_VERSION" ]
+                then
+                    XB_BIN="xtrabackup_55"
+                else
+                    XB_BIN="xtrabackup_innodb55"
+                fi
+                ;;
+            5.6 | 10.0 )
+                XB_BIN="xtrabackup_56"
+                DEFAULT_IBDATA_SIZE="12M"
+                ;;
+            *)
+                vlog "Unknown MySQL/InnoDB version: $MYSQL_VERSION/$INNODB_VERSION"
+                exit -1
+                ;;
+        esac
     fi
 
     XB_PATH="`which $XB_BIN`"

=== modified file 'test/t/bug1028949.sh'
--- test/t/bug1028949.sh	2013-06-20 07:44:19 +0000
+++ test/t/bug1028949.sh	2013-07-25 17:40:36 +0000
@@ -1,9 +1,6 @@
 . inc/common.sh
 
-if [ -z "$INNODB_VERSION" ]; then
-    echo "Requires InnoDB plugin or XtraDB" >$SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+[ -n "$INNODB_VERSION" ] || skip_test "Requires InnoDB plugin or XtraDB"
 
 function test_bug_1028949()
 {

=== modified file 'test/t/bug1192347.sh'
--- test/t/bug1192347.sh	2013-06-20 22:41:55 +0000
+++ test/t/bug1192347.sh	2013-07-25 17:40:36 +0000
@@ -9,9 +9,8 @@
 ${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
 probe_result=$?
 if [[ "$probe_result" == "0" ]]
-    then
-        echo "Server supports wsrep" > $SKIPPED_REASON
-        exit $SKIPPED_EXIT_CODE
+then
+        skip_test "Server supports wsrep"
 fi
 set -e
 

=== modified file 'test/t/bug606981.sh'
--- test/t/bug606981.sh	2013-04-27 18:46:54 +0000
+++ test/t/bug606981.sh	2013-07-25 17:40:36 +0000
@@ -2,8 +2,7 @@
 
 if test "`uname -s`" != "Linux"
 then
-    echo "Requires Linux" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+    skip_test "Requires Linux"
 fi
 
 MYSQLD_EXTRA_MY_CNF_OPTS="

=== modified file 'test/t/bug733651.sh'
--- test/t/bug733651.sh	2012-06-04 18:29:48 +0000
+++ test/t/bug733651.sh	2013-07-25 17:40:36 +0000
@@ -5,26 +5,45 @@
 
 . inc/common.sh
 
+# Require XtraDB <= 5.5 until bug #1194828 is fixed
+if is_xtradb && is_server_version_higher_than 5.6.0
+then
+    skip_test "Doesn't work with XtraDB 5.6, bug #1194828"
+fi
+
 options="innodb_log_files_in_group innodb_log_file_size"
-if [ ! -z "$XTRADB_VERSION" ]; then
-    options="$options innodb_page_size innodb_fast_checksum innodb_log_block_size"
+
+# innodb_page_size is supported in XtraDB 5.1+ and InnoDB 5.6+
+if is_xtradb || is_server_version_higher_than 5.6.0
+then
+    options="$options innodb_page_size"
+fi
+
+# innodb_fast_checksum is supported in XtraDB 5.1/5.5
+if is_xtradb && is_server_version_lower_than 5.6.0
+then
+    options="$options innodb_fast_checksum"
+fi
+
+# innodb_log_block_size is only supported in XtraDB
+if is_xtradb
+then
+    options="$options innodb_log_block_size"
 fi
 
 start_server
 
-mkdir -p $topdir/backup
-innobackupex  $topdir/backup
-backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
-vlog "Backup created in directory $backup_dir"
+innobackupex --no-timestamp $topdir/backup
 
 # test presence of options
 for option in $options ; do
 
-	if [ "`cat $backup_dir/backup-my.cnf | grep $option | wc -l`" == "0" ] ; then
-		vlog "Option $option is absent"
-		exit -1
-	else
-		vlog "Option $option is present"
-	fi
+        if ! cat $topdir/backup/backup-my.cnf | grep $option
+        then
+                vlog "Option $option is absent"
+                exit -1
+        else
+                vlog "Option $option is present"
+        fi
 
 done

=== modified file 'test/t/bug759225.sh'
--- test/t/bug759225.sh	2013-04-27 18:46:54 +0000
+++ test/t/bug759225.sh	2013-07-25 17:40:36 +0000
@@ -7,14 +7,13 @@
 
 if test "`uname -s`" != "Linux"
 then
-    echo "Requires Linux" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
-
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+    skip_test "Requires Linux"
+fi
+
+require_xtradb
+
+# ALL_O_DIRECT is not supported in XtraDB 5.6 ATM.
+require_server_version_lower_than 5.6.1
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
 innodb_flush_method=ALL_O_DIRECT

=== modified file 'test/t/bug810269.sh'
--- test/t/bug810269.sh	2012-06-05 12:35:33 +0000
+++ test/t/bug810269.sh	2013-07-25 17:40:36 +0000
@@ -6,8 +6,7 @@
 . inc/common.sh
 
 if [ -z "$INNODB_VERSION" ]; then
-    echo "Requires InnoDB plugin or XtraDB" >$SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+    skip_test "Requires InnoDB plugin or XtraDB"
 fi
 
 start_server "--innodb_strict_mode --innodb_file_per_table \

=== modified file 'test/t/bug817132.sh'
--- test/t/bug817132.sh	2012-06-05 12:35:33 +0000
+++ test/t/bug817132.sh	2013-07-25 17:40:36 +0000
@@ -8,8 +8,7 @@
 # defaults to 'xtrabackup'. So any build configurations other than xtradb51
 # would fail in Jenkins.
 if [ "`basename $XB_BIN`" != "xtrabackup" ]; then
-    echo "Requires xtradb51" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+    skip_test "Requires xtradb51"
 fi
 
 start_server

=== modified file 'test/t/bug930062.sh'
--- test/t/bug930062.sh	2013-03-06 09:17:17 +0000
+++ test/t/bug930062.sh	2013-07-25 17:40:36 +0000
@@ -5,24 +5,37 @@
 
 . inc/common.sh
 
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
-
-if [ ${MYSQL_VERSION:0:3} = "5.5" ]
-then
-    import_option="--innodb_import_table_from_xtrabackup=1"
+MYSQLD_EXTRA_MY_CNF_OPTS="innodb_file_per_table=0"
+if [ "$MYSQL_VERSION_MAJOR" -gt 5 -o \
+     "$MYSQL_VERSION_MINOR" -ge 6 ]
+then
+    # For server versions >= 5.6 we don't need any special server options to
+    # enable table import
+    true
+elif [ -n "$XTRADB_VERSION" ]
+then
+    case "$MYSQL_VERSION_MAJOR.$MYSQL_VERSION_MINOR" in
+        5.5 )
+            import_option="innodb_import_table_from_xtrabackup=1";;
+        5.1 | 5.2 | 5.3 )
+            import_option="innodb_expand_import=1";;
+        *)
+            die "Unknown XtraDB version";;
+    esac
+    MYSQLD_EXTRA_MY_CNF_OPTS="$MYSQLD_EXTRA_MY_CNF_OPTS
+$import_option"
 else
-    import_option="--innodb_expand_import=1"
+    skip_test "Requires XtraDB 5.1+ or InnoDB 5.6+"
 fi
 
-mysql_extra_args="--innodb_file_per_table $import_option"
-
-start_server $mysql_extra_args
+start_server
 
 backup_dir=$topdir/backup
 
+# Enable innodb_file_per_table dynamically, so we get individual tablespaces to
+# export
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "SET GLOBAL innodb_file_per_table=1"
+
 load_dbase_schema sakila
 load_dbase_data sakila
 
@@ -42,7 +55,7 @@
 
 innobackupex --apply-log --export $backup_dir
 
-start_server $mysql_extra_args
+start_server
 
 run_cmd ${MYSQL} ${MYSQL_ARGS} sakila <<EOF
 SET foreign_key_checks=0;

=== modified file 'test/t/bug976945.sh'
--- test/t/bug976945.sh	2013-04-27 18:46:54 +0000
+++ test/t/bug976945.sh	2013-07-25 17:40:36 +0000
@@ -3,10 +3,11 @@
 ############################################################################
 . inc/common.sh
 
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+require_xtradb
+
+# Require XtraDB <= 5.5 until bug #1194828 is fixed
+is_server_version_lower_than 5.6.0 || \
+    skip_test "Doesn't work with XtraDB 5.6, bug #1194828"
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
 innodb_log_block_size=4096

=== modified file 'test/t/bug977652.sh'
--- test/t/bug977652.sh	2012-06-14 10:50:28 +0000
+++ test/t/bug977652.sh	2013-07-25 17:40:36 +0000
@@ -3,10 +3,7 @@
 #              full backup in Xtrabackup 2.0.0
 #############################################################################
 
-if ! which qpress > /dev/null 2>&1 ; then
-  echo "Requires qpress to be installed" > $SKIPPED_REASON
-  exit $SKIPPED_EXIT_CODE
-fi
+require_qpress
 
 . inc/common.sh
 

=== modified file 'test/t/bug983695.sh'
--- test/t/bug983695.sh	2013-07-22 12:38:55 +0000
+++ test/t/bug983695.sh	2013-07-25 17:40:36 +0000
@@ -4,10 +4,7 @@
 
 . inc/common.sh
 
-if ! which qpress > /dev/null 2>&1 ; then
-  echo "Requires qpress to be installed" > $SKIPPED_REASON
-  exit $SKIPPED_EXIT_CODE
-fi
+require_qpress
 
 start_server --innodb_file_per_table
 load_sakila

=== modified file 'test/t/bug983720_galerainfo.sh'
--- test/t/bug983720_galerainfo.sh	2013-07-23 19:26:07 +0000
+++ test/t/bug983720_galerainfo.sh	2013-07-25 17:40:36 +0000
@@ -12,8 +12,7 @@
     then
         vlog "Server supports wsrep"
     else
-        echo "Requires WSREP enabled" > $SKIPPED_REASON
-        exit $SKIPPED_EXIT_CODE
+        skip_test "Requires WSREP enabled"
 fi
 set -e
 

=== modified file 'test/t/bug983720_lrudump.sh'
--- test/t/bug983720_lrudump.sh	2012-06-05 12:35:33 +0000
+++ test/t/bug983720_lrudump.sh	2013-07-25 17:40:36 +0000
@@ -4,9 +4,9 @@
 
 . inc/common.sh
 
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+if ! is_xtradb || is_server_version_higher_than 5.6.0
+then
+    skip_test "Requires Percona Server <= 5.5"
 fi
 
 start_server

=== modified file 'test/t/bug999750.sh'
--- test/t/bug999750.sh	2012-06-05 12:35:33 +0000
+++ test/t/bug999750.sh	2013-07-25 17:40:36 +0000
@@ -7,8 +7,7 @@
 # Exclude the built-in InnoDB configuration as it requires a different format
 # for --incremental-lsn.
 if [ -z "$INNODB_VERSION" ]; then
-    echo "Requires InnoDB plugin or XtraDB" >$SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+    skip_test "Requires InnoDB plugin or XtraDB"
 fi
 
 start_server

=== modified file 'test/t/compact_compressed.sh'
--- test/t/compact_compressed.sh	2013-07-03 20:00:57 +0000
+++ test/t/compact_compressed.sh	2013-07-25 17:40:36 +0000
@@ -5,8 +5,7 @@
 . inc/common.sh
 
 if [ -z "$INNODB_VERSION" ]; then
-    echo "Requires InnoDB plugin or XtraDB" >$SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+    skip_test "Requires InnoDB plugin or XtraDB"
 fi
 
 # Use innodb_strict_mode so that failure to use compression results in an 

=== modified file 'test/t/ddl.sh'
--- test/t/ddl.sh	2013-05-07 07:53:25 +0000
+++ test/t/ddl.sh	2013-07-25 17:40:36 +0000
@@ -8,8 +8,7 @@
 . inc/common.sh
 
 if ! $XB_BIN --help 2>&1 | grep -q debug-sync; then
-    echo "Requires --debug-sync support" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+    skip_test "Requires --debug-sync support"
 fi
 
 MYSQLD_EXTRA_MY_CNF_OPTS="

=== modified file 'test/t/gtid.sh'
--- test/t/gtid.sh	2013-04-24 10:02:31 +0000
+++ test/t/gtid.sh	2013-07-25 17:40:36 +0000
@@ -4,11 +4,7 @@
 
 . inc/common.sh
 
-if [ ${MYSQL_VERSION:0:3} != "5.6" ]
-then
-    echo "Requires a 5.6 server" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+require_server_version_higher_than 5.6.0
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
 gtid_mode=on

=== modified file 'test/t/ib_buffer_pool.sh'
--- test/t/ib_buffer_pool.sh	2013-04-25 14:32:09 +0000
+++ test/t/ib_buffer_pool.sh	2013-07-25 17:40:36 +0000
@@ -4,10 +4,7 @@
 
 . inc/common.sh
 
-if [ "${MYSQL_VERSION:0:3}" != "5.6" ]; then
-    echo "Requires MySQL 5.6" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+require_server_version_higher_than 5.6.0
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
 innodb_buffer_pool_filename=pool/dump

=== modified file 'test/t/ib_buffer_pool_dump_incremental.sh'
--- test/t/ib_buffer_pool_dump_incremental.sh	2013-04-25 14:32:09 +0000
+++ test/t/ib_buffer_pool_dump_incremental.sh	2013-07-25 17:40:36 +0000
@@ -4,10 +4,7 @@
 
 . inc/common.sh
 
-if [ "${MYSQL_VERSION:0:3}" != "5.6" ]; then
-    echo "Requires MySQL 5.6" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+require_server_version_higher_than 5.6.0
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
 innodb_buffer_pool_filename=pool/dump

=== modified file 'test/t/ib_buffer_pool_rsync.sh'
--- test/t/ib_buffer_pool_rsync.sh	2013-04-25 14:32:09 +0000
+++ test/t/ib_buffer_pool_rsync.sh	2013-07-25 17:40:36 +0000
@@ -5,14 +5,10 @@
 . inc/common.sh
 
 if ! which rsync > /dev/null 2>&1 ; then
-    echo "Requires rsync to be installed" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+    skip_test "Requires rsync to be installed"
 fi
 
-if [ "${MYSQL_VERSION:0:3}" != "5.6" ]; then
-    echo "Requires MySQL 5.6" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+require_server_version_higher_than 5.6.0
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
 innodb_buffer_pool_filename=pool/dump

=== modified file 'test/t/ib_compress_basic.sh'
--- test/t/ib_compress_basic.sh	2013-01-07 06:17:40 +0000
+++ test/t/ib_compress_basic.sh	2013-07-25 17:40:36 +0000
@@ -4,10 +4,7 @@
 
 . inc/common.sh
 
-if ! which qpress > /dev/null 2>&1 ; then
-  echo "Requires qpress to be installed" > $SKIPPED_REASON
-  exit $SKIPPED_EXIT_CODE
-fi
+require_qpress
 
 start_server --innodb_file_per_table
 load_sakila

=== modified file 'test/t/ib_doublewrite.sh'
--- test/t/ib_doublewrite.sh	2013-04-27 18:48:50 +0000
+++ test/t/ib_doublewrite.sh	2013-07-25 17:40:36 +0000
@@ -9,9 +9,9 @@
 
 . inc/common.sh
 
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+if ! is_xtradb || is_server_version_higher_than 5.6.0
+then
+    skip_test "Requires Percona Server <= 5.5"
 fi
 
 DBLWR=dblwr.ibd

=== modified file 'test/t/ib_incremental_bitmap.sh'
--- test/t/ib_incremental_bitmap.sh	2013-04-16 10:35:58 +0000
+++ test/t/ib_incremental_bitmap.sh	2013-07-25 17:40:36 +0000
@@ -1,9 +1,6 @@
 # Test for incremental backups that use changed page bitmaps
 
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+require_xtradb
 
 # The test is disabled for Percona XtraDB Cluster until a version
 # with bitmap user requests is released (containing PS 5.5.29-30.0 
@@ -13,12 +10,13 @@
 probe_result=$?
 if [[ "$probe_result" == "0" ]]
     then
-        vlog "Incompatible test" > $SKIPPED_REASON
-        exit $SKIPPED_EXIT_CODE
+        skip_test "Incompatible test"
 fi
 set -e
 
-mysqld_extra_args=--innodb-track-changed-pages=TRUE
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb-track-changed-pages=TRUE
+"
 ib_inc_extra_args=
 
 . inc/ib_incremental_common.sh

=== modified file 'test/t/ib_incremental_force_full_scan.sh'
--- test/t/ib_incremental_force_full_scan.sh	2013-04-16 10:35:58 +0000
+++ test/t/ib_incremental_force_full_scan.sh	2013-07-25 17:40:36 +0000
@@ -1,9 +1,6 @@
 # Test for incremental backups that use forced full scan even when bitmaps are present
 
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+require_xtradb
 
 # The test is disabled for Percona XtraDB Cluster until a version
 # with bitmap user requests is released (containing PS 5.5.29-30.0 
@@ -13,13 +10,14 @@
 probe_result=$?
 if [[ "$probe_result" == "0" ]]
     then
-        vlog "Incompatible test" > $SKIPPED_REASON
-        exit $SKIPPED_EXIT_CODE
+        skip_test "Incompatible test"
 fi
 set -e
 
 
-mysqld_extra_args=--innodb-track-changed-pages=TRUE
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb-track-changed-pages=TRUE
+"
 ib_inc_extra_args=--incremental-force-scan
 
 . inc/ib_incremental_common.sh

=== modified file 'test/t/ib_incremental_full_scan.sh'
--- test/t/ib_incremental_full_scan.sh	2013-04-16 10:35:58 +0000
+++ test/t/ib_incremental_full_scan.sh	2013-07-25 17:40:36 +0000
@@ -1,6 +1,5 @@
 # Test incremental backups that do full data file scans
 
-mysqld_extra_args=
 ib_inc_extra_args=
 
 . inc/ib_incremental_common.sh

=== modified file 'test/t/ib_lru_dump_basic.sh'
--- test/t/ib_lru_dump_basic.sh	2012-06-05 12:35:33 +0000
+++ test/t/ib_lru_dump_basic.sh	2013-07-25 17:40:36 +0000
@@ -4,9 +4,9 @@
 
 . inc/common.sh
 
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+if ! is_xtradb || is_server_version_higher_than 5.6.0
+then
+    skip_test "Requires Percona Server <= 5.5"
 fi
 
 start_server

=== modified file 'test/t/ib_lru_dump_rsync.sh'
--- test/t/ib_lru_dump_rsync.sh	2012-06-05 12:35:33 +0000
+++ test/t/ib_lru_dump_rsync.sh	2013-07-25 17:40:36 +0000
@@ -4,14 +4,13 @@
 
 . inc/common.sh
 
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+if ! is_xtradb || is_server_version_higher_than 5.6.0
+then
+    skip_test "Requires Percona Server <= 5.5"
 fi
 
 if ! which rsync > /dev/null 2>&1 ; then
-    echo "Requires rsync to be installed" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+    skip_test "Requires rsync to be installed"
 fi
 
 start_server

=== modified file 'test/t/ib_lru_dump_stream.sh'
--- test/t/ib_lru_dump_stream.sh	2012-06-05 12:35:33 +0000
+++ test/t/ib_lru_dump_stream.sh	2013-07-25 17:40:36 +0000
@@ -4,9 +4,9 @@
 
 . inc/common.sh
 
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+if ! is_xtradb || is_server_version_higher_than 5.6.0
+then
+    skip_test "Requires Percona Server <= 5.5"
 fi
 
 start_server

=== modified file 'test/t/ib_rsync.sh'
--- test/t/ib_rsync.sh	2012-06-04 18:29:48 +0000
+++ test/t/ib_rsync.sh	2013-07-25 17:40:36 +0000
@@ -2,8 +2,7 @@
 
 if ! which rsync > /dev/null 2>&1
 then
-    echo "Requires rsync to be installed" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+    skip_test "Requires rsync to be installed"
 fi
 
 start_server --innodb_file_per_table

=== modified file 'test/t/ib_rsync_nolock.sh'
--- test/t/ib_rsync_nolock.sh	2013-02-13 10:52:52 +0000
+++ test/t/ib_rsync_nolock.sh	2013-07-25 17:40:36 +0000
@@ -2,8 +2,7 @@
 
 if ! which rsync > /dev/null 2>&1
 then
-    echo "Requires rsync to be installed" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+    skip_test "Requires rsync to be installed"
 fi
 
 start_server --innodb_file_per_table

=== modified file 'test/t/ib_stream_compress.sh'
--- test/t/ib_stream_compress.sh	2013-03-11 19:11:29 +0000
+++ test/t/ib_stream_compress.sh	2013-07-25 17:40:36 +0000
@@ -2,10 +2,7 @@
 # Test streaming + compression
 ############################################################################
 
-if ! which qpress > /dev/null 2>&1 ; then
-  echo "Requires qpress to be installed" > $SKIPPED_REASON
-  exit $SKIPPED_EXIT_CODE
-fi
+require_qpress
 
 stream_format=xbstream
 stream_extract_cmd="xbstream -xv <"

=== modified file 'test/t/ib_stream_compress_encrypt.sh'
--- test/t/ib_stream_compress_encrypt.sh	2013-03-11 19:11:29 +0000
+++ test/t/ib_stream_compress_encrypt.sh	2013-07-25 17:40:36 +0000
@@ -2,10 +2,7 @@
 # Test streaming + compression + encryption
 ############################################################################
 
-if ! which qpress > /dev/null 2>&1 ; then
-  echo "Requires qpress to be installed" > $SKIPPED_REASON
-  exit $SKIPPED_EXIT_CODE
-fi
+require_qpress
 
 encrypt_algo="AES256"
 encrypt_key="percona_xtrabackup_is_awesome___"

=== modified file 'test/t/innodb_page_size.sh'
--- test/t/innodb_page_size.sh	2013-04-23 11:04:23 +0000
+++ test/t/innodb_page_size.sh	2013-07-25 17:40:36 +0000
@@ -4,10 +4,9 @@
 
 . inc/common.sh
 
-if [ ${MYSQL_VERSION:0:3} != "5.6" -a -z "$XTRADB_VERSION" ]
+if ! is_server_version_higher_than 5.6.0 && ! is_xtradb
 then
-    echo "Requires either XtraDB or a 5.6 server" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+    skip_test "Requires either XtraDB or a 5.6 server"
 fi
 
 MYSQLD_EXTRA_MY_CNF_OPTS="

=== modified file 'test/t/remote_tablespaces.sh'
--- test/t/remote_tablespaces.sh	2013-07-03 18:30:28 +0000
+++ test/t/remote_tablespaces.sh	2013-07-25 17:40:36 +0000
@@ -4,11 +4,7 @@
 
 . inc/common.sh
 
-if [ ${MYSQL_VERSION:0:3} != "5.6" ]
-then
-    echo "Requires a 5.6 server" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+require_server_version_higher_than 5.6.0
 
 start_server --innodb_file_per_table
 

=== modified file 'test/t/server_version.sh'
--- test/t/server_version.sh	2013-05-17 11:07:26 +0000
+++ test/t/server_version.sh	2013-07-25 17:40:36 +0000
@@ -12,9 +12,8 @@
     "xtradb51" | "xtradb55" | "xtradb56" | "innodb56")
 	;;
     *)
-	echo "Requires (xtradb51|xtradb55|xtradb56|innodb56) \
-build configuration" >> $SKIPPED_REASON
-	exit $SKIPPED_EXIT_CODE
+	skip_test "Requires (xtradb51|xtradb55|xtradb56|innodb56) \
+build configuration"
 	;;
 esac
 

=== modified file 'test/t/undo_tablespaces.sh'
--- test/t/undo_tablespaces.sh	2013-07-03 18:30:28 +0000
+++ test/t/undo_tablespaces.sh	2013-07-25 17:40:36 +0000
@@ -4,11 +4,7 @@
 
 . inc/common.sh
 
-if [ ${MYSQL_VERSION:0:3} != "5.6" ]
-then
-    echo "Requires a 5.6 server" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+require_server_version_higher_than 5.6.0
 
 ################################################################################
 # Start an uncommitted transaction pause "indefinitely" to keep the connection

=== modified file 'test/t/xb_compress.sh'
--- test/t/xb_compress.sh	2013-03-11 19:11:29 +0000
+++ test/t/xb_compress.sh	2013-07-25 17:40:36 +0000
@@ -2,10 +2,7 @@
 # Test basic local backup with compression
 ############################################################################
 
-if ! which qpress > /dev/null 2>&1 ; then
-  echo "Requires qpress to be installed" > $SKIPPED_REASON
-  exit $SKIPPED_EXIT_CODE
-fi
+require_qpress
 
 innobackupex_options="--compress --compress-threads=4 --compress-chunk-size=8K"
 data_decompress_cmd="for i in *.qp;  do qpress -d \$i ./; done; \

=== modified file 'test/t/xb_compress_encrypt.sh'
--- test/t/xb_compress_encrypt.sh	2013-03-11 19:11:29 +0000
+++ test/t/xb_compress_encrypt.sh	2013-07-25 17:40:36 +0000
@@ -2,11 +2,7 @@
 # Test basic local backup with compression and encryption
 ############################################################################
 
-if ! which qpress > /dev/null 2>&1 ; then
-  echo "Requires qpress to be installed" > $SKIPPED_REASON
-  exit $SKIPPED_EXIT_CODE
-fi
-
+require_qpress
 
 encrypt_algo="AES256"
 encrypt_key="percona_xtrabackup_is_awesome___"

=== modified file 'test/t/xb_export.sh'
--- test/t/xb_export.sh	2013-04-26 17:44:17 +0000
+++ test/t/xb_export.sh	2013-07-25 17:40:36 +0000
@@ -1,16 +1,19 @@
 . inc/common.sh
 
-if [ -z "$XTRADB_VERSION" -a ${MYSQL_VERSION:0:3} != "5.6" ]; then
-    echo "Requires XtraDB or MySQL 5.6" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+if ! is_xtradb && ! is_server_version_higher_than 5.6.0
+then
+    skip_test "Requires XtraDB or MySQL 5.6+"
 fi
 
 import_option=""
 
-if [ ! -z "$XTRADB_VERSION" ]
+if is_xtradb
 then
-    # additional agrument should be passed to XtraDB
-    if [ ${MYSQL_VERSION:0:3} = "5.5" ]
+    if is_server_version_higher_than 5.6.0
+        # No additional options for XtraDB 5.6+
+    then
+        true
+    elif is_server_version_higher_than 5.5.0
     then
         import_option="--innodb_import_table_from_xtrabackup=1"
     else

=== modified file 'test/t/xb_galera_info.sh'
--- test/t/xb_galera_info.sh	2013-07-23 19:26:07 +0000
+++ test/t/xb_galera_info.sh	2013-07-25 17:40:36 +0000
@@ -8,8 +8,7 @@
     then
         vlog "Server supports wsrep"
     else
-        echo "Requires WSREP enabled" > $SKIPPED_REASON
-        exit $SKIPPED_EXIT_CODE
+        skip_test "Requires WSREP enabled"
 fi
 set -e
 

=== modified file 'test/t/xb_galera_sst.sh'
--- test/t/xb_galera_sst.sh	2013-07-23 17:58:06 +0000
+++ test/t/xb_galera_sst.sh	2013-07-25 17:40:36 +0000
@@ -19,8 +19,7 @@
     then
         vlog "Server supports wsrep"
     else
-        echo "Requires WSREP enabled" > $SKIPPED_REASON
-        exit $SKIPPED_EXIT_CODE
+        skip_test "Requires WSREP enabled"
 fi
 set -e
 

=== modified file 'test/t/xb_incremental_bitmap_misc.sh'
--- test/t/xb_incremental_bitmap_misc.sh	2013-04-16 10:35:58 +0000
+++ test/t/xb_incremental_bitmap_misc.sh	2013-07-25 17:40:36 +0000
@@ -1,9 +1,6 @@
 # Test diagnostics for missing bitmap data and --incremental-force-scan option
 
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+require_xtradb
 
 # The test is disabled for Percona XtraDB Cluster until a version
 # with bitmap user requests is released (containing PS 5.5.29-30.0 
@@ -13,22 +10,23 @@
 probe_result=$?
 if [[ "$probe_result" == "0" ]]
     then
-        vlog "Incompatible test" > $SKIPPED_REASON
-        exit $SKIPPED_EXIT_CODE
+        skip_test "Incompatible test"
 fi
 set -e
 
 . inc/common.sh
 
-mysqld_extra_args=--innodb-track-changed-pages=TRUE
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb-track-changed-pages=TRUE
+"
 
-start_server $mysqld_extra_args
+start_server
 ${MYSQL} ${MYSQL_ARGS} -e "CREATE TABLE t1 (a INT) ENGINE=INNODB" test
 ${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO t1 VALUES (1)" test
 
 # Force checkpoint
 shutdown_server
-start_server $mysqld_extra_args
+start_server
 
 # Full backup
 # mkdir $topdir/data/full
@@ -37,15 +35,15 @@
 ${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO t1 VALUES (2)" test
 # Force checkpoint
 shutdown_server
-start_server $mysqld_extra_args
+start_server
 ${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO t1 VALUES (3)" test
 # Force checkpoint
 shutdown_server
-start_server $mysqld_extra_args
+start_server
 ${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO t1 VALUES (4)" test
 # Force checkpoint
 shutdown_server
-start_server $mysqld_extra_args
+start_server
 
 ls -l $mysql_datadir/*.xdb
 

=== modified file 'test/t/xb_incremental_compressed.inc'
--- test/t/xb_incremental_compressed.inc	2013-04-16 10:35:58 +0000
+++ test/t/xb_incremental_compressed.inc	2013-07-25 17:40:36 +0000
@@ -2,7 +2,7 @@
 # Test incremental backup with InnoDB compression
 ################################################################################
 # Expects the following variable to be set before including:
-#    mysqld_extra_args: an extra arg to be passed for all mysqld invocations.  
+#    MYSQLD_EXTRA_MY_CNF_OPTS: an extra arg to be passed for all mysqld invocations.  
 #                       Use this to set special options that influence 
 #                       incremental backups, e.g. turns on log archiving or 
 #                       changed page bitmap output.
@@ -42,11 +42,14 @@
 
   # Use innodb_strict_mode so that failure to use compression results in an 
   # error rather than a warning
-  mysqld_additional_args="$mysqld_extra_args --innodb_strict_mode \
-      --innodb_file_per_table --innodb_file_format=Barracuda \
-      --innodb_max_dirty_pages_pct=0 --innodb_log_file_size=1M"
+  MYSQLD_EXTRA_MY_CNF_OPTS="${MYSQLD_EXTRA_MY_CNF_OPTS:-""}
+innodb_strict_mode
+innodb_file_per_table
+innodb_file_format=Barracuda
+innodb_max_dirty_pages_pct=0
+innodb_log_file_size=1M"
   
-  start_server ${mysqld_additional_args}
+  start_server
 
   load_dbase_schema incremental_sample
 
@@ -82,7 +85,7 @@
 
   vlog "Starting backup"
 
-  xtrabackup --datadir=$mysql_datadir --backup --target-dir=$topdir/data/full ${mysqld_additional_args}
+  xtrabackup --datadir=$mysql_datadir --backup --target-dir=$topdir/data/full
 
   vlog "Full backup done"
 
@@ -99,7 +102,7 @@
 
   # Rotate bitmap file here and force checkpoint at the same time
   shutdown_server
-  start_server ${mysqld_additional_args}
+  start_server
 
   add_rows test 12501 15000
   add_rows t2 12501 15000
@@ -139,7 +142,7 @@
   # Incremental backup
   xtrabackup --datadir=$mysql_datadir --backup \
       --target-dir=$topdir/data/delta --incremental-basedir=$topdir/data/full \
-      ${mysqld_additional_args} $suspend_arg &
+      $suspend_arg &
 
   xb_pid=$!
 
@@ -158,14 +161,14 @@
 
   # Prepare backup
   xtrabackup --datadir=$mysql_datadir --prepare \
-      --apply-log-only --target-dir=$topdir/data/full ${mysqld_additional_args}
+      --apply-log-only --target-dir=$topdir/data/full
   vlog "Log applied to backup"
   xtrabackup --datadir=$mysql_datadir --prepare \
       --apply-log-only --target-dir=$topdir/data/full \
-      --incremental-dir=$topdir/data/delta ${mysqld_additional_args}
+      --incremental-dir=$topdir/data/delta
   vlog "Delta applied to backup"
   xtrabackup --datadir=$mysql_datadir --prepare \
-      --target-dir=$topdir/data/full ${mysqld_additional_args}
+      --target-dir=$topdir/data/full
   vlog "Data prepared for restore"
 
   # removing rows
@@ -186,7 +189,7 @@
 
   vlog "Data restored"
 
-  start_server ${mysqld_additional_args}
+  start_server
 
   vlog "Checking checksums"
   checksum_test_b=`checksum_table incremental_sample test`

=== modified file 'test/t/xb_incremental_compressed_bitmap_16kb.sh'
--- test/t/xb_incremental_compressed_bitmap_16kb.sh	2013-04-16 10:35:58 +0000
+++ test/t/xb_incremental_compressed_bitmap_16kb.sh	2013-07-25 17:40:36 +0000
@@ -1,9 +1,6 @@
 # Test incremental backups that use bitmaps with 16KB compressed pages
 
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+require_xtradb
 
 # The test is disabled for Percona XtraDB Cluster until a version
 # with bitmap user requests is released (containing PS 5.5.29-30.0 
@@ -13,12 +10,13 @@
 probe_result=$?
 if [[ "$probe_result" == "0" ]]
     then
-        vlog "Incompatible test" > $SKIPPED_REASON
-        exit $SKIPPED_EXIT_CODE
+        skip_test "Incompatible test"
 fi
 set -e
 
-mysqld_extra_args=--innodb-track-changed-pages=TRUE
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb-track-changed-pages=TRUE
+"
 first_inc_suspend_command="FLUSH CHANGED_PAGE_BITMAPS;"
 
 source t/xb_incremental_compressed.inc

=== modified file 'test/t/xb_incremental_compressed_bitmap_1kb.sh'
--- test/t/xb_incremental_compressed_bitmap_1kb.sh	2013-04-16 10:35:58 +0000
+++ test/t/xb_incremental_compressed_bitmap_1kb.sh	2013-07-25 17:40:36 +0000
@@ -1,9 +1,6 @@
 # Test incremental backups that use bitmaps with 1KB compressed pages
 
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+require_xtradb
 
 # The test is disabled for Percona XtraDB Cluster until a version
 # with bitmap user requests is released (containing PS 5.5.29-30.0 
@@ -13,12 +10,13 @@
 probe_result=$?
 if [[ "$probe_result" == "0" ]]
     then
-        vlog "Incompatible test" > $SKIPPED_REASON
-        exit $SKIPPED_EXIT_CODE
+        skip_test "Incompatible test"
 fi
 set -e
 
-mysqld_extra_args=--innodb-track-changed-pages=TRUE
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb-track-changed-pages=TRUE
+"
 first_inc_suspend_command="FLUSH CHANGED_PAGE_BITMAPS;"
 
 source t/xb_incremental_compressed.inc

=== modified file 'test/t/xb_incremental_compressed_bitmap_2kb.sh'
--- test/t/xb_incremental_compressed_bitmap_2kb.sh	2013-04-16 10:35:58 +0000
+++ test/t/xb_incremental_compressed_bitmap_2kb.sh	2013-07-25 17:40:36 +0000
@@ -1,9 +1,6 @@
 # Test incremental backups that use bitmaps with 2KB compressed pages
 
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+require_xtradb
 
 # The test is disabled for Percona XtraDB Cluster until a version
 # with bitmap user requests is released (containing PS 5.5.29-30.0 
@@ -13,12 +10,13 @@
 probe_result=$?
 if [[ "$probe_result" == "0" ]]
     then
-        vlog "Incompatible test" > $SKIPPED_REASON
-        exit $SKIPPED_EXIT_CODE
+        skip_test "Incompatible test"
 fi
 set -e
 
-mysqld_extra_args=--innodb-track-changed-pages=TRUE
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb-track-changed-pages=TRUE
+"
 first_inc_suspend_command="FLUSH CHANGED_PAGE_BITMAPS;"
 
 source t/xb_incremental_compressed.inc

=== modified file 'test/t/xb_incremental_compressed_bitmap_4kb.sh'
--- test/t/xb_incremental_compressed_bitmap_4kb.sh	2013-04-16 10:35:58 +0000
+++ test/t/xb_incremental_compressed_bitmap_4kb.sh	2013-07-25 17:40:36 +0000
@@ -1,9 +1,6 @@
 # Test incremental backups that use bitmaps with 4KB compressed pages
 
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+require_xtradb
 
 # The test is disabled for Percona XtraDB Cluster until a version
 # with bitmap user requests is released (containing PS 5.5.29-30.0 
@@ -13,12 +10,13 @@
 probe_result=$?
 if [[ "$probe_result" == "0" ]]
     then
-        vlog "Incompatible test" > $SKIPPED_REASON
-        exit $SKIPPED_EXIT_CODE
+        skip_test "Incompatible test"
 fi
 set -e
 
-mysqld_extra_args=--innodb-track-changed-pages=TRUE
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb-track-changed-pages=TRUE
+"
 first_inc_suspend_command="FLUSH CHANGED_PAGE_BITMAPS;"
 
 source t/xb_incremental_compressed.inc

=== modified file 'test/t/xb_incremental_compressed_bitmap_8kb.sh'
--- test/t/xb_incremental_compressed_bitmap_8kb.sh	2013-04-16 10:35:58 +0000
+++ test/t/xb_incremental_compressed_bitmap_8kb.sh	2013-07-25 17:40:36 +0000
@@ -1,9 +1,6 @@
 # Test incremental backups that use bitmaps with 8KB compressed pages
 
-if [ -z "$XTRADB_VERSION" ]; then
-    echo "Requires XtraDB" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
-fi
+require_xtradb
 
 # The test is disabled for Percona XtraDB Cluster until a version
 # with bitmap user requests is released (containing PS 5.5.29-30.0 
@@ -13,12 +10,13 @@
 probe_result=$?
 if [[ "$probe_result" == "0" ]]
     then
-        vlog "Incompatible test" > $SKIPPED_REASON
-        exit $SKIPPED_EXIT_CODE
+        skip_test "Incompatible test"
 fi
 set -e
 
-mysqld_extra_args=--innodb-track-changed-pages=TRUE
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb-track-changed-pages=TRUE
+"
 first_inc_suspend_command="FLUSH CHANGED_PAGE_BITMAPS;"
 
 source t/xb_incremental_compressed.inc

=== modified file 'test/t/xb_incremental_compressed_full_scan_16kb.sh'
--- test/t/xb_incremental_compressed_full_scan_16kb.sh	2013-04-16 10:35:58 +0000
+++ test/t/xb_incremental_compressed_full_scan_16kb.sh	2013-07-25 17:40:36 +0000
@@ -1,6 +1,5 @@
 # Test incremental backups that do full data scans with 16KB compressed pages
 
-mysqld_extra_args=
 first_inc_suspend_command=
 
 source t/xb_incremental_compressed.inc

=== modified file 'test/t/xb_incremental_compressed_full_scan_1kb.sh'
--- test/t/xb_incremental_compressed_full_scan_1kb.sh	2013-04-16 10:35:58 +0000
+++ test/t/xb_incremental_compressed_full_scan_1kb.sh	2013-07-25 17:40:36 +0000
@@ -1,6 +1,5 @@
 # Test incremental backups that do full data scans with 1KB compressed pages
 
-mysqld_extra_args=
 first_inc_suspend_command=
 
 source t/xb_incremental_compressed.inc

=== modified file 'test/t/xb_incremental_compressed_full_scan_2kb.sh'
--- test/t/xb_incremental_compressed_full_scan_2kb.sh	2013-04-16 10:35:58 +0000
+++ test/t/xb_incremental_compressed_full_scan_2kb.sh	2013-07-25 17:40:36 +0000
@@ -1,6 +1,5 @@
 # Test incremental backups that do full data scans with 2KB compressed pages
 
-mysqld_extra_args=
 first_inc_suspend_command=
 
 source t/xb_incremental_compressed.inc

=== modified file 'test/t/xb_incremental_compressed_full_scan_4kb.sh'
--- test/t/xb_incremental_compressed_full_scan_4kb.sh	2013-04-16 10:35:58 +0000
+++ test/t/xb_incremental_compressed_full_scan_4kb.sh	2013-07-25 17:40:36 +0000
@@ -1,6 +1,5 @@
 # Test incremental backups that do full data scans with 4KB compressed pages
 
-mysqld_extra_args=
 first_inc_suspend_command=
 
 source t/xb_incremental_compressed.inc

=== modified file 'test/t/xb_incremental_compressed_full_scan_8kb.sh'
--- test/t/xb_incremental_compressed_full_scan_8kb.sh	2013-04-16 10:35:58 +0000
+++ test/t/xb_incremental_compressed_full_scan_8kb.sh	2013-07-25 17:40:36 +0000
@@ -1,6 +1,5 @@
 # Test incremental backups that do full data scans with 8KB compressed pages
 
-mysqld_extra_args=
 first_inc_suspend_command=
 
 source t/xb_incremental_compressed.inc

=== modified file 'test/t/xb_log_overwrap.sh'
--- test/t/xb_log_overwrap.sh	2013-04-16 10:35:58 +0000
+++ test/t/xb_log_overwrap.sh	2013-07-25 17:40:36 +0000
@@ -1,8 +1,7 @@
 . inc/common.sh
 
 if ! $XB_BIN --help 2>&1 | grep -q debug-sync; then
-    echo "Requires --debug-sync support" > $SKIPPED_REASON
-    exit $SKIPPED_EXIT_CODE
+    skip_test "Requires --debug-sync support"
 fi
 
 start_server --innodb_log_file_size=1M --innodb_thread_concurrency=1 \

=== modified file 'test/t/xb_parallel_compress.sh'
--- test/t/xb_parallel_compress.sh	2013-03-11 19:11:29 +0000
+++ test/t/xb_parallel_compress.sh	2013-07-25 17:40:36 +0000
@@ -2,10 +2,7 @@
 # Test basic local parallel backup with compression
 ############################################################################
 
-if ! which qpress > /dev/null 2>&1 ; then
-  echo "Requires qpress to be installed" > $SKIPPED_REASON
-  exit $SKIPPED_EXIT_CODE
-fi
+require_qpress
 
 innobackupex_options="--parallel=8 --compress --compress-threads=4 --compress-chunk-size=8K"
 data_decompress_cmd="for i in *.qp;  do qpress -d \$i ./; done; \

=== modified file 'test/t/xb_parallel_compress_encrypt.sh'
--- test/t/xb_parallel_compress_encrypt.sh	2013-03-11 19:11:29 +0000
+++ test/t/xb_parallel_compress_encrypt.sh	2013-07-25 17:40:36 +0000
@@ -2,10 +2,7 @@
 # Test basic local parallel backup with compression and encryption
 ############################################################################
 
-if ! which qpress > /dev/null 2>&1 ; then
-  echo "Requires qpress to be installed" > $SKIPPED_REASON
-  exit $SKIPPED_EXIT_CODE
-fi
+require_qpress
 
 encrypt_algo="AES256"
 encrypt_key="percona_xtrabackup_is_awesome___"

=== modified file 'test/t/xb_parallel_incremental.sh'
--- test/t/xb_parallel_incremental.sh	2012-06-05 12:35:33 +0000
+++ test/t/xb_parallel_incremental.sh	2013-07-25 17:40:36 +0000
@@ -4,6 +4,12 @@
 
 . inc/common.sh
 
+if is_server_version_higher_than 5.6.0 && \
+   is_server_version_lower_than 5.6.11
+then
+    skip_test "Doesn't work for server 5.6.x if x < 11, bug #1203669"
+fi
+
 start_server --innodb_file_per_table
 
 load_dbase_schema sakila