List:Commits« Previous MessageNext Message »
From:Alfranio Correia Date:July 19 2011 4:47pm
Subject:bzr push into mysql-next-mr-wl5569 branch (alfranio.correia:3352 to 3353)
View as plain text  
 3353 Alfranio Correia	2011-07-19
      Suppressed warning messages that could potentially cause problems while
      running mts crash safe test cases.

    modified:
      mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result
      mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe.test
      mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe.test
      mysql-test/suite/rpl/t/rpl_row_mts_crash_safe.test
      mysql-test/suite/rpl/t/rpl_row_mts_rec_crash_safe.test
      mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test
      mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe.test
 3352 Andrei Elkin	2011-07-18
      wl#5569 MTS
      
      Cosmetic changes are done to address readability and clearness of source code of the MTS patch.
     @ sql/binlog.cc
        Comments improved.
     @ sql/log_event.cc
        Warning text is improved.
     @ sql/log_event.h
        More comments are added.
     @ sql/rpl_rli.h
        More comments are added.
     @ sql/rpl_slave.cc
        Error constant was changed.
     @ sql/share/errmsg-utf8.txt
        Error constant is changed.

    modified:
      sql/binlog.cc
      sql/log_event.cc
      sql/log_event.h
      sql/rpl_rli.h
      sql/rpl_slave.cc
      sql/share/errmsg-utf8.txt
=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result	2011-07-09 22:08:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result	2011-07-19 16:46:43 +0000
@@ -1,5 +1,9 @@
 include/master-slave.inc
 [connection master]
+call mtr.add_suppression('Attempting backtrace');
+call mtr.add_suppression("Recovery from master pos .*");
+call mtr.add_suppression(".*  InnoDB: Warning: allocated tablespace .*, old maximum was .*");
+call mtr.add_suppression(".*int __cxa_pure_virtual().*");
 SET @commands= 'configure';
 SET @commands= 'configure';
 CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result	2011-07-09 22:08:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result	2011-07-19 16:46:43 +0000
@@ -1,6 +1,9 @@
 include/master-slave.inc
 [connection master]
-call mtr.add_suppression("Recovery from master pos *");
+call mtr.add_suppression('Attempting backtrace');
+call mtr.add_suppression("Recovery from master pos .*");
+call mtr.add_suppression(".*  InnoDB: Warning: allocated tablespace .*, old maximum was .*");
+call mtr.add_suppression(".*int __cxa_pure_virtual().*");
 SET @commands= 'configure';
 SET @commands= 'configure';
 CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result	2011-07-09 22:08:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result	2011-07-19 16:46:43 +0000
@@ -1,5 +1,9 @@
 include/master-slave.inc
 [connection master]
+call mtr.add_suppression('Attempting backtrace');
+call mtr.add_suppression("Recovery from master pos .*");
+call mtr.add_suppression(".*  InnoDB: Warning: allocated tablespace .*, old maximum was .*");
+call mtr.add_suppression(".*int __cxa_pure_virtual().*");
 SET @commands= 'configure';
 SET @commands= 'configure';
 CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result	2011-07-09 22:08:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result	2011-07-19 16:46:43 +0000
@@ -1,6 +1,9 @@
 include/master-slave.inc
 [connection master]
-call mtr.add_suppression("Recovery from master pos *");
+call mtr.add_suppression('Attempting backtrace');
+call mtr.add_suppression("Recovery from master pos .*");
+call mtr.add_suppression(".*  InnoDB: Warning: allocated tablespace .*, old maximum was .*");
+call mtr.add_suppression(".*int __cxa_pure_virtual().*");
 SET @commands= 'configure';
 SET @commands= 'configure';
 CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result	2011-07-09 22:08:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result	2011-07-19 16:46:43 +0000
@@ -1,5 +1,9 @@
 include/master-slave.inc
 [connection master]
+call mtr.add_suppression('Attempting backtrace');
+call mtr.add_suppression("Recovery from master pos .*");
+call mtr.add_suppression(".*  InnoDB: Warning: allocated tablespace .*, old maximum was .*");
+call mtr.add_suppression(".*int __cxa_pure_virtual().*");
 SET @commands= 'configure';
 SET @commands= 'configure';
 CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result	2011-07-09 22:08:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result	2011-07-19 16:46:43 +0000
@@ -1,6 +1,9 @@
 include/master-slave.inc
 [connection master]
-call mtr.add_suppression("Recovery from master pos *");
+call mtr.add_suppression('Attempting backtrace');
+call mtr.add_suppression("Recovery from master pos .*");
+call mtr.add_suppression(".*  InnoDB: Warning: allocated tablespace .*, old maximum was .*");
+call mtr.add_suppression(".*int __cxa_pure_virtual().*");
 SET @commands= 'configure';
 SET @commands= 'configure';
 CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;

=== modified file 'mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe.test	2011-06-28 16:12:24 +0000
+++ b/mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe.test	2011-07-19 16:46:43 +0000
@@ -4,4 +4,9 @@
 --source include/have_debug.inc
 --source include/not_valgrind.inc
 
+call mtr.add_suppression('Attempting backtrace');
+call mtr.add_suppression("Recovery from master pos .*");
+call mtr.add_suppression(".*  InnoDB: Warning: allocated tablespace .*, old maximum was .*");
+call mtr.add_suppression(".*int __cxa_pure_virtual().*");
+
 --source extra/rpl_tests/rpl_mts_crash_safe.test

=== modified file 'mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe.test	2011-07-09 22:08:07 +0000
+++ b/mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe.test	2011-07-19 16:46:43 +0000
@@ -4,6 +4,9 @@
 --source include/have_debug.inc
 --source include/not_valgrind.inc
 
-call mtr.add_suppression("Recovery from master pos *");
+call mtr.add_suppression('Attempting backtrace');
+call mtr.add_suppression("Recovery from master pos .*");
+call mtr.add_suppression(".*  InnoDB: Warning: allocated tablespace .*, old maximum was .*");
+call mtr.add_suppression(".*int __cxa_pure_virtual().*");
 
 --source extra/rpl_tests/rpl_mts_crash_safe.test

=== modified file 'mysql-test/suite/rpl/t/rpl_row_mts_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_row_mts_crash_safe.test	2011-06-28 16:12:24 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_mts_crash_safe.test	2011-07-19 16:46:43 +0000
@@ -4,4 +4,9 @@
 --source include/have_debug.inc
 --source include/not_valgrind.inc
 
+call mtr.add_suppression('Attempting backtrace');
+call mtr.add_suppression("Recovery from master pos .*");
+call mtr.add_suppression(".*  InnoDB: Warning: allocated tablespace .*, old maximum was .*");
+call mtr.add_suppression(".*int __cxa_pure_virtual().*");
+
 --source extra/rpl_tests/rpl_mts_crash_safe.test

=== modified file 'mysql-test/suite/rpl/t/rpl_row_mts_rec_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_row_mts_rec_crash_safe.test	2011-07-09 22:08:07 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_mts_rec_crash_safe.test	2011-07-19 16:46:43 +0000
@@ -4,6 +4,9 @@
 --source include/have_debug.inc
 --source include/not_valgrind.inc
 
-call mtr.add_suppression("Recovery from master pos *");
+call mtr.add_suppression('Attempting backtrace');
+call mtr.add_suppression("Recovery from master pos .*");
+call mtr.add_suppression(".*  InnoDB: Warning: allocated tablespace .*, old maximum was .*");
+call mtr.add_suppression(".*int __cxa_pure_virtual().*");
 
 --source extra/rpl_tests/rpl_mts_crash_safe.test

=== modified file 'mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test	2011-06-28 16:12:24 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test	2011-07-19 16:46:43 +0000
@@ -4,4 +4,9 @@
 --source include/have_debug.inc
 --source include/not_valgrind.inc
 
+call mtr.add_suppression('Attempting backtrace');
+call mtr.add_suppression("Recovery from master pos .*");
+call mtr.add_suppression(".*  InnoDB: Warning: allocated tablespace .*, old maximum was .*");
+call mtr.add_suppression(".*int __cxa_pure_virtual().*");
+
 --source extra/rpl_tests/rpl_mts_crash_safe.test

=== modified file 'mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe.test	2011-07-09 22:08:07 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe.test	2011-07-19 16:46:43 +0000
@@ -4,6 +4,9 @@
 --source include/have_debug.inc
 --source include/not_valgrind.inc
 
-call mtr.add_suppression("Recovery from master pos *");
+call mtr.add_suppression('Attempting backtrace');
+call mtr.add_suppression("Recovery from master pos .*");
+call mtr.add_suppression(".*  InnoDB: Warning: allocated tablespace .*, old maximum was .*");
+call mtr.add_suppression(".*int __cxa_pure_virtual().*");
 
 --source extra/rpl_tests/rpl_mts_crash_safe.test

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-next-mr-wl5569 branch (alfranio.correia:3352 to 3353) Alfranio Correia20 Jul