List:Commits« Previous MessageNext Message »
From:marko.makela Date:April 19 2012 6:50am
Subject:bzr push into mysql-trunk branch (marko.makela:3881 to 3882)
View as plain text  
 3882 Marko Mäkelä	2012-04-19
      Try to fix a innodb.innodb-index-online test failure on Windows.
      
      Apparently, the $ anchor in the mtr.add_suppression regular expression
      does not always match the end of line on Windows. Remove it.

    modified:
      mysql-test/suite/innodb/r/innodb-index-online.result
      mysql-test/suite/innodb/t/innodb-index-online.test
 3881 Nuno Carvalho	2012-04-19
      BUG#13680651: RPL_CORRUPTION TEST FAILS WITH SLAVE STOPPED WITH WRONG ERROR CODE ON VALGRIND
      
      Errors numbers shifted and include/wait_for_slave_io_error.inc does not
      supports error names, so changed 1741 to new
      ER_NETWORK_READ_EVENT_CHECKSUM_FAILURE number (1742).

    modified:
      mysql-test/suite/rpl/r/rpl_corruption.result
      mysql-test/suite/rpl/t/rpl_corruption.test
=== modified file 'mysql-test/suite/innodb/r/innodb-index-online.result'
--- a/mysql-test/suite/innodb/r/innodb-index-online.result	revid:nuno.carvalho@stripped
+++ b/mysql-test/suite/innodb/r/innodb-index-online.result	revid:marko.makela@strippedh
@@ -4,8 +4,8 @@ SET DEBUG='d,query,debug_sync_exec:i:t:A
 call mtr.add_suppression("InnoDB: Warning: Small buffer pool size");
 call mtr.add_suppression("Cannot find index .*c2 in InnoDB index translation table");
 call mtr.add_suppression("Find index .*c2 in InnoDB index list but not its MySQL index number");
-call mtr.add_suppression("InnoDB: Error: table 'test/t1'$");
-call mtr.add_suppression("MySQL is trying to open a table handle but the .ibd file for$");
+call mtr.add_suppression("InnoDB: Error: table 'test/t1'");
+call mtr.add_suppression("MySQL is trying to open a table handle but the .ibd file for");
 SET GLOBAL innodb_file_per_table=on;
 CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT, c3 INT) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1,1,0),(2,2,0),(3,3,0),(4,4,0),(5,5,0);

=== modified file 'mysql-test/suite/innodb/t/innodb-index-online.test'
--- a/mysql-test/suite/innodb/t/innodb-index-online.test	revid:nuno.carvalho@strippedpt22hicij3t83
+++ b/mysql-test/suite/innodb/t/innodb-index-online.test	revid:marko.makela@stripped5-2qhwiueodqxxaxch
@@ -10,8 +10,8 @@ call mtr.add_suppression("InnoDB: Warnin
 call mtr.add_suppression("Cannot find index .*c2 in InnoDB index translation table");
 call mtr.add_suppression("Find index .*c2 in InnoDB index list but not its MySQL index number");
 # these will be triggered by DISCARD TABLESPACE
-call mtr.add_suppression("InnoDB: Error: table 'test/t1'$");
-call mtr.add_suppression("MySQL is trying to open a table handle but the .ibd file for$");
+call mtr.add_suppression("InnoDB: Error: table 'test/t1'");
+call mtr.add_suppression("MySQL is trying to open a table handle but the .ibd file for");
 
 # DISCARD TABLESPACE needs file-per-table
 let $per_table=`select @@innodb_file_per_table`;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (marko.makela:3881 to 3882) marko.makela20 Apr