List:Commits« Previous MessageNext Message »
From:Rohit Kalhans Date:February 14 2012 6:54am
Subject:bzr push into mysql-trunk branch (rohit.kalhans:3893 to 3894) Bug#11758263
View as plain text  
 3894 Rohit Kalhans	2012-02-14
      Bug#11758263: Fixing failure in rpl.pl_parallel_temp_query on PB2

    modified:
      mysql-test/suite/rpl/r/rpl_parallel_temp_query.result
      mysql-test/suite/rpl/t/rpl_parallel_temp_query.test
 3893 Sunny Bains	2012-02-14
      Bug #13628249 - ASSERT MAX_UNDO_LOGS == ULINT_UNDEFINED WHEN INNODB-FORCE-RECOVERY >= 5
      Bug #13628420	NORML SHUTDOWN HANGS WHEN INNODB-FORCE-RECOVERY=3 AND THERE ARE TXNS TO ROLLBACK
      
      There are two parts to this fix, the first was introduced by the fix for
      bug#13255225. The srv_undo_logs should be set to ULINT_UNDEFINED if force
      recovery >= 3.
      
      The second fix is to prevent data dictionary temp tables and indexes drop,
      if force recovery >= 3. This is the same level at which we prevent rollback
      of recovered user transactions.
      
      rb://944 Approved by Jimmy Yang.

    added:
      mysql-test/suite/innodb/r/innodb_bug-13628249.result
      mysql-test/suite/innodb/t/innodb_bug-13628249.test
    modified:
      storage/innobase/log/log0recv.cc
      storage/innobase/srv/srv0start.cc
      storage/innobase/trx/trx0roll.cc
      storage/innobase/trx/trx0sys.cc
      storage/innobase/trx/trx0trx.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_temp_query.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_temp_query.result	2011-11-19 08:08:03 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_temp_query.result	2012-02-14 06:53:45 +0000
@@ -3,7 +3,7 @@ Warnings:
 Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
-call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as transactional or temporary table.*');
+call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.');
 flush status;
 include/stop_slave.inc
 set @save.slave_parallel_workers= @@global.slave_parallel_workers;
@@ -13,18 +13,26 @@ create database d2;
 use d2;
 create table d2.t1 (a int auto_increment primary key, b int) engine=innodb;
 insert into d2.t1 (b) select count(*) from tt_##;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave.
 create database d1;
 use d1;
 create table d1.t1 (a int auto_increment primary key, b int) engine=innodb;
 insert into d1.t1 (b) select count(*) from tt_##;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave.
 create database d4;
 use d4;
 create table d4.t1 (a int auto_increment primary key, b int) engine=innodb;
 insert into d4.t1 (b) select count(*) from tt_##;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave.
 create database d3;
 use d3;
 create table d3.t1 (a int auto_increment primary key, b int) engine=innodb;
 insert into d3.t1 (b) select count(*) from tt_##;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave.
 include/diff_tables.inc [master:d4.t1, slave:d4.t1]
 include/diff_tables.inc [master:d3.t1, slave:d3.t1]
 include/diff_tables.inc [master:d2.t1, slave:d2.t1]

=== modified file 'mysql-test/suite/rpl/t/rpl_parallel_temp_query.test'
--- a/mysql-test/suite/rpl/t/rpl_parallel_temp_query.test	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel_temp_query.test	2012-02-14 06:53:45 +0000
@@ -7,7 +7,7 @@
 --source include/master-slave.inc
 --source include/have_binlog_format_statement.inc
 
-call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as transactional or temporary table.*');
+call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.');
 
 let $temp_tables= 16;
 let $workers= 4;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (rohit.kalhans:3893 to 3894) Bug#11758263Rohit Kalhans14 Feb