From: Andrei Elkin
Date: June 21 2011 3:15pm
Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3313) WL#5569
List-Archive: http://lists.mysql.com/commits/139599
Message-Id: <201106211515.p5LFFmHY011508@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0222223318=="

--===============0222223318==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl5569/ based on revid:alfranio.correia@stripped

 3313 Andrei Elkin	2011-06-21
      wl#5569 MTS
      
      rpl_parallel_start_stop.test could fail sporadicaly with timeout.
     @ mysql-test/include/wait_for_slave_param.inc
        Correcting comments and handling of passed by caller $slave_timeout to make sure
        the unit of 1 second really holds.
        Introduced symbolic default_timeout, sleep_freq(uency) to procude time to sleep in between of
        two polls.
     @ mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
        Since the default time to wait is less than one for innodb's wait for lock,
        the time to wait for error is set explicitly.

    modified:
      mysql-test/include/wait_for_slave_param.inc
      mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
=== modified file 'mysql-test/include/wait_for_slave_param.inc'
--- a/mysql-test/include/wait_for_slave_param.inc	2010-12-20 14:57:35 +0000
+++ b/mysql-test/include/wait_for_slave_param.inc	2011-06-21 15:15:43 +0000
@@ -29,8 +29,8 @@
 #     --let $slave_param_comparison= !=
 #
 # $slave_timeout
-#   The default timeout is 5 minutes. You can change the timeout by
-#   setting $slave_timeout. The unit is seconds.
+#   The default timeout is $default_timeout seconds. You can change the timeout by
+#   setting $slave_timeout. The unit is one second.
 #
 # $slave_error_param
 #   If set, this script will check if the column of the output from
@@ -45,11 +45,14 @@
 --let $include_filename= wait_for_slave_param.inc [$slave_param]
 --source include/begin_include_file.inc
 
+--let $default_timeout= 30
+--let $sleep_freq= 10
+--let $sleep_time= `select 1.0 / $sleep_freq`
 
 let $_slave_timeout= $slave_timeout;
 if (!$_slave_timeout)
 {
-  let $_slave_timeout= 300;
+  let $_slave_timeout= `select $default_timeout * $sleep_freq`;
 }
 
 if ($slave_error_param == '')
@@ -110,7 +113,7 @@ while ($_slave_continue)
       --source include/show_rpl_debug_info.inc
       --die Timeout in include/wait_for_slave_param.inc
     }
-    --sleep  0.1
+    --sleep  $sleep_time
   }
 }
 

=== modified file 'mysql-test/suite/rpl/t/rpl_parallel_start_stop.test'
--- a/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test	2011-06-20 13:26:35 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test	2011-06-21 15:15:43 +0000
@@ -169,6 +169,9 @@ update t1 set a=21 where a=2;
 
 # slave is stopped
 
+# setting timeout to be as twice as greater than innodb's.
+--let $slave_timeout=`select 2*@@global.innodb_lock_wait_timeout`
+
 let $slave_sql_errno= 1213, 1205; 
 source include/wait_for_slave_sql_error.inc;
 


--===============0222223318==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/andrei.elkin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrei.elkin@stripped
# target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\
#   mr-wl5569/
# testament_sha1: 69b50f7812087e4f8c69db8854551602d4e37a3a
# timestamp: 2011-06-21 18:15:48 +0300
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/
# base_revision_id: alfranio.correia@stripped\
#   sfyyfaisztf64299
# 
# Begin bundle
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


--===============0222223318==--