bzr push into mysql-pe branch (luis.soares:3668 to 3669)

[Luis Soares]

 3669 Luis Soares	2009-11-06 [merge]
      manual merge: mysql-5.1-bugteam --> mysql-pe
      
      CONFLICTS
      =========
      
       M  mysql-test/include/mtr_warnings.sql                                             
                                                                               
      Text conflict in mysql-test/include/mtr_warnings.sql
      1 conflicts encountered.     

    modified:
      mysql-test/include/mtr_warnings.sql
 3668 Alexander Nozdrin	2009-11-06 [merge]
      Auto-merge from remote mysql-pe.

    modified:
      configure.in
      mysql-test/r/innodb_mysql.result
      mysql-test/r/olap.result
      mysql-test/t/innodb_mysql.test
      mysql-test/t/olap.test
      sql/item_cmpfunc.cc
      sql/sql_select.cc
=== modified file 'mysql-test/include/mtr_warnings.sql'
--- a/mysql-test/include/mtr_warnings.sql	2009-10-23 06:24:37 +0000
+++ b/mysql-test/include/mtr_warnings.sql	2009-11-06 17:11:26 +0000
@@ -193,6 +193,14 @@ INSERT INTO global_suppressions VALUES
    fixed properly. See bug page for more information.
   */
  ("Found lock of type 6 that is write and read locked"),
+ /*
+   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]