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

[Alexey Kopytov]

jenkins.percona.com/view/PXB 2.2/job/percona-xtrabackup-2.2-param/279/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/innobackupex.pl'
--- storage/innobase/xtrabackup/innobackupex.pl	2014-12-08 06:52:10 +0000
+++ storage/innobase/xtrabackup/innobackupex.pl	2015-01-17 09:05:19 +0000
@@ -79,6 +79,7 @@
 my $have_flush_engine_logs = 0;
 my $have_multi_threaded_slave = 0;
 my $have_gtid_slave = 0;
+my $have_lock_wait_timeout = 0;
 
 # command line options
 my $option_help = '';
@@ -3444,6 +3445,13 @@
     my $con = shift;
     my $queries_hash_ref;
 
+    if ($have_lock_wait_timeout) {
+        # Set the maximum supported session value for lock_wait_timeout to
+        # prevent unnecessary timeouts when the global value is changed from the
+        # default
+        mysql_query($con, "SET SESSION lock_wait_timeout=31536000");
+    }
+
     if ($have_backup_locks) {
         $now = current_time();
         print STDERR "$now  $prefix Executing LOCK TABLES FOR BACKUP...\n";
@@ -5005,6 +5013,8 @@
         (defined($gtid_slave_pos) and $gtid_slave_pos ne '')) {
         $have_gtid_slave = 1;
     }
+
+    $have_lock_wait_timeout = defined($con->{vars}->{lock_wait_timeout});
 }
 
 #
 
=== added file 'storage/innobase/xtrabackup/test/t/bug1410339.sh'
--- storage/innobase/xtrabackup/test/t/bug1410339.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1410339.sh	2015-01-17 09:05:19 +0000
@@ -0,0 +1,53 @@
+###############################################################################
+# Bug #1410339: Set session lock_wait_timeout value to its default value before
+#               executing FTWRL
+###############################################################################
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+loose-lock_wait_timeout=1
+"
+
+start_server
+
+function blocking_statement()
+{
+    $MYSQL $MYSQL_ARGS test -e "INSERT INTO t VALUES (SLEEP(10000))"
+}
+
+function start_innobackupex()
+{
+    innobackupex --no-timestamp $topdir/backup
+}
+
+$MYSQL $MYSQL_ARGS test <<EOF
+CREATE TABLE t (a INT) ENGINE=MyISAM;
+EOF
+
+blocking_statement &
+job1=$!
+
+while ! $MYSQL $MYSQL_ARGS -e "SHOW PROCESSLIST" | grep "INSERT"
+do
+    sleep 1
+done
+
+conn_id=`$MYSQL $MYSQL_ARGS -e "SHOW PROCESSLIST" | grep "INSERT" | awk '{print $1;}'`
+
+start_innobackupex &
+job2=$!
+
+while ! $MYSQL $MYSQL_ARGS -e "SHOW PROCESSLIST" | grep "LOCK"
+do
+    sleep 1
+done
+
+# Make sure we wait longer than lock_wait_timeout
+sleep 1
+
+$MYSQL $MYSQL_ARGS -e "KILL $conn_id"
+
+kill -SIGKILL $job1
+
+# Test that FTWRL / LOCK TABLES FOR BACKUP succeeds
+
+wait $job2