List:Commits« Previous MessageNext Message »
From:Alfranio Correia Date:June 28 2010 1:50pm
Subject:bzr commit into mysql-trunk-bugfixing branch (alfranio.correia:3080)
Bug#53259
View as plain text  
#At file:///home/acorreia/workspace.sun/repository.mysql.new/bzrwork/bug-53259/mysql-trunk-bugfixing/ based on revid:alfranio.correia@stripped

 3080 Alfranio Correia	2010-06-28
      Post-push fix for BUG#53259.

    modified:
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
      mysql-test/t/innodb_mysql_lock2.test
=== modified file 'mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result'
--- a/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result	2010-05-07 11:10:40 +0000
+++ b/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result	2010-06-28 13:49:48 +0000
@@ -72,8 +72,6 @@ before call db1.p1()
 INSERT INTO db1.t2 VALUES ('before call db1.p2()');
 BEGIN;
 CALL db1.p2();
-Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional table after accessing a transactional table within the same transaction.
 ROLLBACK;
 INSERT INTO db1.t2 VALUES ('after call db1.p2()');
 SELECT * FROM db1.t1;

=== modified file 'mysql-test/t/innodb_mysql_lock2.test'
--- a/mysql-test/t/innodb_mysql_lock2.test	2010-06-17 13:31:51 +0000
+++ b/mysql-test/t/innodb_mysql_lock2.test	2010-06-28 13:49:48 +0000
@@ -12,6 +12,10 @@
 # Save the initial number of concurrent sessions.
 --source include/count_sessions.inc
 
+--disable_query_log
+CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
+--enable_query_log
+
 --echo #
 --echo # Test how do we handle locking in various cases when
 --echo # we read data from InnoDB tables.


Attachment: [text/bzr-bundle]
Thread
bzr commit into mysql-trunk-bugfixing branch (alfranio.correia:3080)Bug#53259Alfranio Correia28 Jun