List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:September 6 2009 8:24am
Subject:bzr push into mysql-5.4-mtr branch (Bjorn.Munch:2852 to 2853)
View as plain text  
 2853 Bjorn Munch	2009-09-06
      merge followup: suppressions in rpl.rpl_get_master_version_and_clock

    modified:
      mysql-test/r/merge_recover.result
      mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
      mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
      mysql-test/t/merge_recover.test
 2852 Bjorn Munch	2009-09-03
      a few followup fixes after merge from -next

    added:
      mysql-test/suite/backup/t/backup_slow_query_log-master.opt
    modified:
      mysql-test/r/merge_recover.result
      mysql-test/t/merge_recover.test
=== modified file 'mysql-test/r/merge_recover.result'
--- a/mysql-test/r/merge_recover.result	2009-09-03 17:46:37 +0000
+++ b/mysql-test/r/merge_recover.result	2009-09-06 08:22:25 +0000
@@ -15,7 +15,7 @@
 #
 call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:");
 call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
-call mtr.add_suppression("./test/t1");
+call mtr.add_suppression(" '\./test/t1'");
 set global table_open_cache=256;
 set global table_definition_cache=256;
 drop procedure if exists p_create;

=== modified file 'mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result'
--- a/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result	2009-07-20 05:02:41 +0000
+++ b/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result	2009-09-06 08:22:25 +0000
@@ -4,6 +4,8 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+call mtr.add_suppression("Slave I/O: .* failed with error: Lost connection to MySQL server at 'reading initial communication packet'");
+call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed: failed registering on master, reconnecting to try again");
 set global debug= 'd,before_get_UNIX_TIMESTAMP_bug45214';
 stop slave;
 start slave;

=== modified file 'mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test'
--- a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test	2009-07-20 05:02:41 +0000
+++ b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test	2009-09-06 08:22:25 +0000
@@ -16,6 +16,10 @@
 
 source include/master-slave.inc;
 source include/have_debug.inc;
+
+call mtr.add_suppression("Slave I/O: .* failed with error: Lost connection to MySQL server at 'reading initial communication packet'");
+call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed: failed registering on master, reconnecting to try again");
+
 #Test case 1: Try to get the value of the UNIX_TIMESTAMP from master under network disconnection
 connection slave;
 let $debug_saved= `select @@global.debug`;

=== modified file 'mysql-test/t/merge_recover.test'
--- a/mysql-test/t/merge_recover.test	2009-09-03 17:46:37 +0000
+++ b/mysql-test/t/merge_recover.test	2009-09-06 08:22:25 +0000
@@ -18,7 +18,7 @@ connection con1;
 
 call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:");
 call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
-call mtr.add_suppression("./test/t1");
+call mtr.add_suppression(" '\./test/t1'");
 
 set global table_open_cache=256;
 set global table_definition_cache=256;


Attachment: [text/bzr-bundle] bzr/bjorn.munch@sun.com-20090906082225-6i7otholzxuity7e.bundle
Thread
bzr push into mysql-5.4-mtr branch (Bjorn.Munch:2852 to 2853) Bjorn Munch6 Sep