bzr push into mysql-5.1-bugteam branch (luis.soares:3199 to 3200)

[Luis Soares]

 3200 Luis Soares	2009-11-06 [merge]
      auto-merge bzr bundle from bug report into latest mysql-5.1-bugteam.

    modified:
      mysql-test/include/mtr_warnings.sql
 3199 Alexey Kopytov	2009-11-06 [merge]
      Automerge.

=== modified file 'mysql-test/include/mtr_warnings.sql'
--- a/mysql-test/include/mtr_warnings.sql	2009-10-16 21:25:05 +0000
+++ b/mysql-test/include/mtr_warnings.sql	2009-11-06 17:08:06 +0000
@@ -175,6 +175,15 @@ INSERT INTO global_suppressions VALUES
  ("Can't find file: '.\\\\test\\\\\\?{8}.frm'"),
  ("Slave: Unknown table 't1' Error_code: 1051"),
 
+ /*
+   Transient network failures that cause warnings on reconnect.
+   BUG#47743 and BUG#47983.
+ */
+ ("Slave I/O: Get master SERVER_ID failed with error:.*"),
+ ("Slave I/O: Get master clock failed with error:.*"),
+ ("Slave I/O: Get master COLLATION_SERVER failed with error:.*"),
+ ("Slave I/O: Get master TIME_ZONE failed with error:.*"),
+
  ("THE_LAST_SUPPRESSION")||
 
 


Attachment: [text/bzr-bundle] bzr/[e-mail]