bzr push into mysql-trunk branch (manish.4.kumar:4218 to 4219) Bug#13886150

[Manish Kumar]

 4219 Manish Kumar	2012-08-10 [merge]
      BUG#13886150 - RPL.RPL_INCIDENT FAILS ON PB2 SPORADICALLY DUE TO TIMEOUT
      
      Upmerge from mysql-5.6 -> mysql-trunk

    modified:
      mysql-test/suite/rpl/t/rpl_incident-master.opt
 4218 Astha Pareek	2012-08-10 [merge]
      upmerge from mysql-5.6 => mysql-trunk

    modified:
      mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result
      mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test
=== modified file 'mysql-test/suite/rpl/t/rpl_incident-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_incident-master.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_incident-master.opt	2012-08-10 10:14:29 +0000
@@ -1 +1 @@
---loose-debug=+d,incident_database_resync_on_replace
+--force-restart --loose-debug=+d,incident_database_resync_on_replace

No bundle (reason: useless for push emails).