Merge lp:~akopytov/percona-xtrabackup/bug1269694-2.2 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

Null merge from 2.1 with the exception of cleanups in bootstrap.sh.

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/90/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/test/bootstrap.sh'
--- storage/innobase/xtrabackup/test/bootstrap.sh	2013-11-12 08:56:58 +0000
+++ storage/innobase/xtrabackup/test/bootstrap.sh	2014-01-16 12:17:06 +0000
@@ -98,12 +98,6 @@
         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
-        ;;
-
     mariadb51)
         url="http://s3.amazonaws.com/percona.com/downloads/community"
         tarball="mariadb-5.1.67-Linux-$arch.tar.gz"
@@ -152,48 +146,17 @@
 fi
 mkdir "$destdir"
 
-if test ! $galera
-then
-    if test -n "$url"
-    then
-        echo "Downloading $tarball"
-        wget -qc "$url/$tarball"
-    fi
-
-    echo "Unpacking $tarball into $destdir"
-    tar zxf $tarball -C $destdir
-    sourcedir="$destdir/`ls $destdir`"
-    if test -n "$sourcedir"
-    then
-        mv $sourcedir/* $destdir
-        rm -rf $sourcedir
-    fi
-else
-    if test ! -d galerabuild
-    then
-        bzr init-repo galerabuild
-    fi
-    cd galerabuild
-
-    rm -rf percona-xtradb-cluster
-    bzr branch lp:percona-xtradb-cluster percona-xtradb-cluster
-    rm -rf galera2x
-    bzr branch lp:galera/2.x galera2x
-    cd percona-xtradb-cluster
-    cmake -DENABLE_DTRACE=0 -DWITH_WSREP:BOOL="1" -DCMAKE_INSTALL_PREFIX="../../server"
-
-    if test -f /proc/cpuinfo
-    then
-        MAKE_J=`grep '^processor' /proc/cpuinfo | wc -l`
-    else
-        MAKE_J=4
-    fi
-
-    make -j$MAKE_J
-    make install
-
-    cd ../galera2x
-    ./scripts/build.sh
-    cp libgalera_smm.so ../../server/
-    cd ..
+if test -n "$url"
+then
+    echo "Downloading $tarball"
+    wget -qc "$url/$tarball"
+fi
+
+echo "Unpacking $tarball into $destdir"
+tar zxf $tarball -C $destdir
+sourcedir="$destdir/`ls $destdir`"
+if test -n "$sourcedir"
+then
+    mv $sourcedir/* $destdir
+    rm -rf $sourcedir
 fi