Merge lp:~akopytov/percona-xtrabackup/bug817132-1.6 into lp:percona-xtrabackup/1.6

[Alexey Kopytov]

Lots of failures in Jenkins due to missing zlib on slaves: http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-1.6-param/43/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2011-06-11 08:00:46 +0000
+++ innobackupex	2011-09-13 17:06:25 +0000
@@ -215,7 +215,7 @@
 
 # initialize global variables and perform some checks
 if ($option_copy_back) {
-    $option_ibbackup_binary = 'xtrabackup_51' if (! $option_ibbackup_binary);
+    $option_ibbackup_binary = 'xtrabackup' if ($option_ibbackup_binary eq 'autodetect');
 } elsif ($option_apply_log) {
 	# Read XtraBackup version from backup dir
 	if (-e "$backup_dir/$xtrabackup_binary_file") {

=== added file 'test/t/bug817132.sh'
--- test/t/bug817132.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug817132.sh	2011-09-13 17:06:25 +0000
@@ -0,0 +1,42 @@
+########################################################################
+# Bug #817132: innobackupex copy-back doesn't work without ibbackup
+########################################################################
+
+. inc/common.sh
+
+# innobackupex --copy-back without explicit --ibbackup specification
+# 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
+fi
+
+init
+run_mysqld
+load_dbase_schema sakila
+load_dbase_data sakila
+
+mkdir -p $topdir/backup
+innobackupex  $topdir/backup > $OUTFILE 2>&1 
+backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
+vlog "Backup created in directory $backup_dir"
+
+stop_mysqld
+# Remove datadir
+rm -r $mysql_datadir
+
+# Restore sakila
+vlog "Applying log"
+innobackupex --apply-log $backup_dir >> $OUTFILE 2>&1
+vlog "Restoring MySQL datadir"
+mkdir -p $mysql_datadir
+
+# The following would fail before #817132 was fixed.
+# Cannot use innobackupex here, because that would specify
+# --ibbackup explicitly (see $IB_ARGS).
+run_cmd $IB_BIN --defaults-file=$topdir/my.cnf --user=root --socket=$mysql_socket --copy-back $backup_dir >> $OUTFILE 2>&1
+
+run_mysqld
+# Check sakila
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "SELECT count(*) from actor" sakila