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

[Alexey Kopytov]

Automerge from 2.1.

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

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/innobackupex.pl'
--- storage/innobase/xtrabackup/innobackupex.pl	2014-01-16 14:23:32 +0000
+++ storage/innobase/xtrabackup/innobackupex.pl	2014-01-24 12:11:56 +0000
@@ -3181,8 +3181,8 @@
             die "Failed to get master binlog coordinates from SHOW MASTER STATUS";
         }
 
-        backup_file("$log_bin_dir", "$log_bin_file", 
-                    "$backup_dir/$log_bin_dir/$log_bin_file")
+        backup_file("$log_bin_dir", "$log_bin_file",
+                    "$backup_dir/$log_bin_file");
     }
 }
 
@@ -3439,8 +3439,8 @@
     if ($option_kill_long_queries_timeout) {
         stop_query_killer();
     }
+    write_galera_info($con) if $option_galera_info;
     write_binlog_info($con);
-    write_galera_info($con) if $option_galera_info;
     $now = current_time();
     print STDERR "$now  $prefix All tables locked and flushed to disk\n";
 }

=== modified file 'storage/innobase/xtrabackup/test/bootstrap.sh'
--- storage/innobase/xtrabackup/test/bootstrap.sh	2014-01-16 08:56:59 +0000
+++ storage/innobase/xtrabackup/test/bootstrap.sh	2014-01-24 12:11:56 +0000
@@ -90,8 +90,8 @@
         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"
+            url="http://www.percona.com/downloads/TESTING/Percona-Server-56/Percona-Server-5.6.10-alpha60.2/binary/linux/$arch"
+            tarball="Percona-Server-5.6.10-alpha60.2-324.Linux.$arch.tar.gz"
         else
             url="http://s3.amazonaws.com/percona.com/downloads/community"
             tarball="Percona-Server-5.6.14-rel62.0-483.Linux.$arch.tar.gz"

=== modified file 'storage/innobase/xtrabackup/test/t/bug1037379.sh'
--- storage/innobase/xtrabackup/test/t/bug1037379.sh	2014-01-12 16:55:59 +0000
+++ storage/innobase/xtrabackup/test/t/bug1037379.sh	2014-01-24 12:11:56 +0000
@@ -4,6 +4,9 @@
 # Bug #887803: innobackupex --safe-slave-backup-timeout option doesn't work
 ################################################################################
 
+# Galera supports only RBR which does not replicated temp. tables
+is_galera && skip_test "Requires a server without Galera support"
+
 . inc/common.sh
 
 ################################################################################

=== modified file 'storage/innobase/xtrabackup/test/t/bug1250375.sh'
--- storage/innobase/xtrabackup/test/t/bug1250375.sh	2014-01-16 14:22:21 +0000
+++ storage/innobase/xtrabackup/test/t/bug1250375.sh	2014-01-24 12:11:56 +0000
@@ -25,6 +25,12 @@
 
 start_server
 
+# Load some data so we have a non-empty Executed_Gtid_Set
+$MYSQL $MYSQL_ARGS test <<EOF
+CREATE TABLE t1(a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1), (2), (3);
+EOF
+
 innobackupex --no-timestamp --galera-info $topdir/backup 
 backup_dir=$topdir/backup
 vlog "Backup created in directory $backup_dir"
@@ -41,9 +47,7 @@
     count=$((count+1))
 done <<< "`run_cmd $MYSQL $MYSQL_ARGS -Nse 'SHOW MASTER STATUS\G' mysql`"
 
-stop_server
-
-if [ -f "$backup_dir/$master_file" ]
+if [ ! -f "$backup_dir/$master_file" ]
 then
     vlog "Could not find bin-log file in backup set, expecting to find $master_file"
     exit 1