bzr push into mysql-trunk branch (andrei.elkin:3795 to 3796)

[Andrei Elkin]

 3796 Andrei Elkin	2012-05-07
      rpl_stm_mts_crash_safe fails on PB2.
      
      Experimenting with the test to reveal more info.
     @ mysql-test/include/wait_condition.inc
        $slave_failure_printout control is added to force
        post-failure printout on the slave side.
     @ mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test
        Temprorarily made the test as regular to observe it
        during few pushes.

    modified:
      mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc
      mysql-test/include/wait_condition.inc
      mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test
 3795 horst.hunger@stripped	2012-05-07
      bug#14041565: Fixed for embedded.

    modified:
      mysql-test/r/variables-big.result
      mysql-test/t/variables-big.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc'
--- a/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc	2012-04-11 16:52:28 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc	2012-05-07 19:15:48 +0000
@@ -94,6 +94,7 @@ if ($commands == recovery)
   SET GLOBAL debug="d,rotate_slave_debug_group";
   --source include/start_slave_io.inc
   let $wait_condition=SELECT Master_log_pos = $m_before_master_pos AND Master_log_name = "$m_before_master_file" FROM mysql.slave_master_info;
+  let $slave_failure_printout= 1;
   --source include/wait_condition.inc
 
   #### Crashing server after assigning and processing jobs ######

=== modified file 'mysql-test/include/wait_condition.inc'
--- a/mysql-test/include/wait_condition.inc	2012-02-08 20:01:18 +0000
+++ b/mysql-test/include/wait_condition.inc	2012-05-07 19:15:48 +0000
@@ -13,12 +13,14 @@
 #
 #   OR
 #
+#    let $slave_failure_printout= 1; # to force post-failure printout
 #    let $wait_timeout= 60; # Override default 30 seconds with 60.
 #    let $wait_condition=
 #      SELECT c = 3 FROM t;
 #    --source include/wait_condition.inc
 #    --echo Executed the test condition $wait_condition_reps times
 #
+# 
 # EXAMPLE
 #    events_bugs.test, events_time_zone.test
 #
@@ -51,5 +53,16 @@ while ($wait_counter)
 }
 if (!$success)
 {
+  if ($slave_failure_printout)
+  {
+     --connection slave
+     --echo
+     --echo *** Slave server status: ***
+     --echo
+     --query_vertical show slave status
+     --query_vertical show processlist
+     --query_vertical select * from mysql.slave_relay_log_info
+     --query_vertical select * from mysql.slave_master_info
+  }
   die Timeout in wait_condition.inc for $wait_condition;
 }

=== modified file 'mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test	2012-03-23 11:48:18 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test	2012-05-07 19:15:48 +0000
@@ -1,4 +1,9 @@
---source include/big_test.inc
+#
+# Temprorarily made as regular to catch a failure
+# visible on weekly runs.
+# todo: restore
+#--source include/big_test.inc
+#
 --source include/master-slave.inc
 --source include/have_binlog_format_statement.inc
 --source include/have_innodb.inc

No bundle (reason: useless for push emails).