List:Commits« Previous MessageNext Message »
From:Li-Bing.Song Date:July 11 2010 8:54am
Subject:bzr push into mysql-5.1-rep+2 branch (Li-Bing.Song:3202 to 3203) WL#4677
View as plain text  
 3203 Li-Bing.Song@stripped	2010-07-11
      Postfix for WL#4677
      Suppress some warnings.

    modified:
      mysql-test/suite/rpl/t/rpl_server_uuid.test
 3202 Li-Bing.Song@stripped	2010-07-11
      Postfix for WL#4677, it also fix Bug#55062.
     @ client/mysqlbinlog.cc
        Fix compiling warning. At some platform, long is 32bit.
        4*1024L*1024L*1024L is large than the biggest int number.
     @ mysql-test/include/mtr_warnings.sql
        Warning messages are changed, so we have to change the suppression sql.
     @ mysql-test/mysql-test-run.pl
        Add code to wait server's UUID generated
     @ mysys/default.c
        Revert the code to fix bug#55062
     @ sql/mysqld.cc
        Improve the error and warning messages.
     @ sql/rpl_record.cc
        Fix a compiling warning.
     @ sql/slave.cc
        Improve the error and warning messages.

    modified:
      client/mysqlbinlog.cc
      mysql-test/include/mtr_warnings.sql
      mysql-test/mysql-test-run.pl
      mysys/default.c
      sql/mysqld.cc
      sql/rpl_record.cc
      sql/slave.cc
=== modified file 'mysql-test/suite/rpl/t/rpl_server_uuid.test'
--- a/mysql-test/suite/rpl/t/rpl_server_uuid.test	2010-06-22 01:41:53 +0000
+++ b/mysql-test/suite/rpl/t/rpl_server_uuid.test	2010-07-11 08:50:23 +0000
@@ -13,6 +13,8 @@
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
 
+call mtr.add_suppression("Slave I/O thread .* register on master");
+call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed: .*");
 CALL mtr.add_suppression(".*master and slave have equal MySQL server UUIDs.*");
 CALL mtr.add_suppression("Master's UUID has changed, its old UUID is.*");
 


Attachment: [text/bzr-bundle] bzr/li-bing.song@sun.com-20100711085023-th08ttzo6hh6mekz.bundle
Thread
bzr push into mysql-5.1-rep+2 branch (Li-Bing.Song:3202 to 3203) WL#4677Li-Bing.Song11 Jul