bzr push into mysql-trunk branch (nuno.carvalho:3854 to 3855) Bug#13941187

[Nuno Carvalho]

 3855 Nuno Carvalho	2012-04-09
      BUG#13941187: RPL.RPL_MASTER_POS_WAIT SPORADIC FAILURES
      
      rpl.rpl_master_pos_wait has sporadic failures on pb2. This is due to the
      indeterminism of running STOP SLAVE SQL_THREAD and 
      SQL_THREAD_WAIT_AFTER_GTIDS in parallel, where the latter may return 
      NULL (slave stoppped) or -1 (timeout).
      
      To avoid SQL_THREAD_WAIT_AFTER_GTIDS return -1, disabled timeout from
      SQL_THREAD_WAIT_AFTER_GTIDS query, setting it to 0.

    modified:
      mysql-test/suite/rpl/r/rpl_master_pos_wait.result
      mysql-test/suite/rpl/t/rpl_master_pos_wait.test
 3854 kevin.lewis@stripped	2012-04-09
      Fix Windows build failure caused by revno: 3850,
      rev-id kevin.lewis@stripped

    modified:
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
=== modified file 'mysql-test/suite/rpl/r/rpl_master_pos_wait.result'
--- a/mysql-test/suite/rpl/r/rpl_master_pos_wait.result	2012-03-23 20:11:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_master_pos_wait.result	2012-04-09 22:45:19 +0000
@@ -35,8 +35,8 @@ SQL_THREAD_WAIT_AFTER_GTIDS('', 2)
 0
 SELECT SQL_THREAD_WAIT_AFTER_GTIDS('error-gtid', 2);
 ERROR HY000: Malformed GTID set specification 'error-gtid'.
-SELECT SQL_THREAD_WAIT_AFTER_GTIDS('7805be8e-51ab-11e1-bacc-6706c20ad7ba:1', 2);
+SELECT SQL_THREAD_WAIT_AFTER_GTIDS('7805be8e-51ab-11e1-bacc-6706c20ad7ba:1', 0);
 STOP SLAVE SQL_THREAD;
-SQL_THREAD_WAIT_AFTER_GTIDS('7805be8e-51ab-11e1-bacc-6706c20ad7ba:1', 2)
+SQL_THREAD_WAIT_AFTER_GTIDS('7805be8e-51ab-11e1-bacc-6706c20ad7ba:1', 0)
 NULL
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_master_pos_wait.test'
--- a/mysql-test/suite/rpl/t/rpl_master_pos_wait.test	2012-02-14 07:55:14 +0000
+++ b/mysql-test/suite/rpl/t/rpl_master_pos_wait.test	2012-04-09 22:45:19 +0000
@@ -53,7 +53,7 @@ SELECT SQL_THREAD_WAIT_AFTER_GTIDS('erro
 # SQL_THREAD_WAIT_AFTER_GTIDS: Check if it hangs when slave is 
 # idle and STOP SLAVE is issued.
 #
-send SELECT SQL_THREAD_WAIT_AFTER_GTIDS('7805be8e-51ab-11e1-bacc-6706c20ad7ba:1', 2);
+send SELECT SQL_THREAD_WAIT_AFTER_GTIDS('7805be8e-51ab-11e1-bacc-6706c20ad7ba:1', 0);
 --connection slave1
 STOP SLAVE SQL_THREAD;
 --connection slave

No bundle (reason: useless for push emails).