From: Andrei Elkin
Date: June 22 2011 4:32pm
Subject: bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3314 to 3315) WL#5569
List-Archive: http://lists.mysql.com/commits/139697
Message-Id: <201106221632.p5MGWuPw023002@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0562546277=="

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

 3315 Andrei Elkin	2011-06-22
      wl#5569 MTS
      
      fixing rpl_parallel_start_stop that failed on Gcov due to wrong calculations
      inside wait_for_slave_param.
      The patch implements the failing multiply operation transparently through SQL.
     @ mysql-test/include/wait_for_slave_param.inc
        Further cleanup in the macro to replace an opaque and possibly creating issues
        builtin "arithmetics" with the correct one of SQL language.
        To prove the waiting interval its start and end timestamps are printed in the error
        branch.
     @ mysql-test/suite/rpl/t/rpl_parallel_start_stop-slave.opt
        Optimizing the test not to wait for less than the innodb default lock timeout (50 secs currently).

    modified:
      mysql-test/include/wait_for_slave_param.inc
      mysql-test/suite/rpl/t/rpl_parallel_start_stop-slave.opt
 3314 Andrei Elkin	2011-06-21 [merge]
      wl#5569 MTS
      
      Fixing valgrind warnings.
     @ sql/log_event.cc
        w->running_status is verfied to find out the actually sought running
        status of a Worker.
        THD can be unavainlable that's what a valgrind report was about.
     @ sql/rpl_rli_pdb.cc
        commenting out an assert that valgrind does not like.
     @ sql/rpl_rli_pdb.h
        new method is added to be invoked at MTS shutdown.
     @ sql/rpl_slave.cc
        Invoking gaq cleanup at the end of MTS session.

    modified:
      sql/log_event.cc
      sql/rpl_rli_pdb.cc
      sql/rpl_rli_pdb.h
      sql/rpl_slave.cc
=== modified file 'mysql-test/include/wait_for_slave_param.inc'
--- a/mysql-test/include/wait_for_slave_param.inc	2011-06-21 15:15:43 +0000
+++ b/mysql-test/include/wait_for_slave_param.inc	2011-06-22 15:48:02 +0000
@@ -49,6 +49,8 @@
 --let $sleep_freq= 10
 --let $sleep_time= `select 1.0 / $sleep_freq`
 
+--let $start_to_wait=`select current_timestamp()`
+
 let $_slave_timeout= $slave_timeout;
 if (!$_slave_timeout)
 {
@@ -80,9 +82,7 @@ if ($_slave_check_configured == 'No such
   --die SHOW SLAVE STATUS returned empty result set. Slave not configured.
 }
 
-# mysqltest doesn't provide any better way to multiply by 10
---let $_wait_for_slave_param_zero= 0
---let $_slave_timeout_counter= $_slave_timeout$zero
+--let $_slave_timeout_counter= `select $_slave_timeout * $sleep_freq`
 --let $_slave_continue= 1
 while ($_slave_continue)
 {
@@ -109,7 +109,9 @@ while ($_slave_continue)
     --dec $_slave_timeout_counter
     if (!$_slave_timeout_counter)
     {
-      --echo **** ERROR: timeout after $_slave_timeout seconds while waiting for slave parameter $slave_param $_slave_param_comparison $slave_param_value ****
+      --let $end_to_wait=`select current_timestamp()`
+
+      --echo **** ERROR: timeout after $_slave_timeout ($end_to_wait - $start_to_wait) seconds while waiting for slave parameter $slave_param $_slave_param_comparison $slave_param_value ****
       --source include/show_rpl_debug_info.inc
       --die Timeout in include/wait_for_slave_param.inc
     }

=== modified file 'mysql-test/suite/rpl/t/rpl_parallel_start_stop-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_parallel_start_stop-slave.opt	2010-12-22 19:19:17 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel_start_stop-slave.opt	2011-06-22 15:48:02 +0000
@@ -1 +1 @@
---relay-log-info-repository=FILE --slave-transaction-retries=0
+--relay-log-info-repository=FILE --slave-transaction-retries=0 --innodb_lock_wait_timeout=10


--===============0562546277==
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: 529fe77d9b8c9465d8fd0638b35602c2fe7c8ba0
# timestamp: 2011-06-22 19:32:56 +0300
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/
# base_revision_id: andrei.elkin@stripped\
#   8pq5dqskhkh3ezu0
# 
# Begin bundle
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
XckU4UJDFPI7YA==


--===============0562546277==--