Merge lp:~sergei.glushchenko/percona-xtrabackup/2.2-xb-bug1326224 into lp:percona-xtrabackup/2.2

[Sergei Glushchenko]

Merge from 2.1 plus workaround for mysql bug http://bugs.mysql.com/bug.php?id=47147

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

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/test/t/kill_long_selects.sh'
--- storage/innobase/xtrabackup/test/t/kill_long_selects.sh	2014-03-24 17:48:44 +0000
+++ storage/innobase/xtrabackup/test/t/kill_long_selects.sh	2014-06-27 14:04:57 +0000
@@ -79,10 +79,20 @@
   rm -f $MYSQLD_TMPDIR/killall.sql
 }
 
+function wait_for_connection_count()
+{
+  n=$(($1 + 1))
+  for i in {1..200} ; do
+    count=`${MYSQL} ${MYSQL_ARGS} -N -e "SHOW PROCESSLIST" test | wc -l`
+    [ $count != $n ] || break
+    sleep 0.3
+  done
+}
+
 start_server --innodb_file_per_table
 
-if $MYSQL $MYSQL_ARGS -Ns -e "SHOW VARIABLES LIKE 'have_backup_locks'\G" \
-     2> /dev/null | egrep -q "^YES$"
+if $MYSQL $MYSQL_ARGS -s -e "SHOW VARIABLES LIKE 'have_backup_locks'\G" \
+     2> /dev/null | egrep -q "Value: YES"
 then
     skip_test "Requires a server without backup locks support"
 fi
@@ -97,11 +107,9 @@
 # ==============================================================
 vlog "===================== case 1 ====================="
 bg_run bg_select_pid "mysql_select 3"
-bg_run bg_update_pid "sleep 1" "mysql_update 3"
-
-sleep 8
-
-innobackupex $topdir/full --kill-long-queries-timeout=10 \
+bg_run bg_update_pid "mysql_update 3"
+
+innobackupex $topdir/full --kill-long-queries-timeout=50 \
                           --kill-long-query-type=all
 
 bg_wait_ok $bg_select_pid
@@ -117,7 +125,8 @@
 #    it. then it may be still alive by the time of kill_all_queries
 vlog "===================== case 2 ====================="
 bg_run bg_select_pid "mysql_select 200"
-bg_run bg_update_pid "sleep 1" "mysql_update 5"
+bg_run bg_update_pid "mysql_update 5"
+wait_for_connection_count 2
 
 innobackupex $topdir/full --kill-long-queries-timeout=3 \
                           --kill-long-query-type=select
@@ -131,6 +140,7 @@
 vlog "===================== case 3 ====================="
 bg_run bg_select_pid "mysql_select 200"
 bg_run bg_update_pid "mysql_update 200"
+wait_for_connection_count 2
 
 innobackupex $topdir/full --kill-long-queries-timeout=3 \
                           --kill-long-query-type=all
@@ -144,8 +154,7 @@
 vlog "===================== case 4 ====================="
 bg_run bg_select_pid "mysql_select 200"
 bg_run bg_update_pid "mysql_update 200"
-
-sleep 1
+wait_for_connection_count 2
 
 run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} $topdir/full \
                           --lock-wait-timeout=3 \
@@ -163,8 +172,7 @@
 vlog "===================== case 5 ====================="
 bg_run bg_select_pid "mysql_select 200"
 bg_run bg_update_pid "mysql_update 200"
-
-sleep 2
+wait_for_connection_count 2
 
 run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} $topdir/full \
                           --lock-wait-timeout=3 \
@@ -181,9 +189,9 @@
 # ==============================================================
 vlog "===================== case 6 ====================="
 bg_run bg_update_pid "mysql_update 5"
-bg_run bg_select_pid "sleep 1" "mysql_select 200"
-
-sleep 2
+wait_for_connection_count 1
+bg_run bg_select_pid "mysql_select 200"
+wait_for_connection_count 2
 
 innobackupex $topdir/full \
                           --lock-wait-timeout=6 \