From 783c6acd7fbb6809934312af84cbd0a8a8c120da Mon Sep 17 00:00:00 2001 From: Alexander Nozdrin Date: Fri, 7 May 2010 15:10:40 +0400 Subject: [PATCH] Fix merge error: update test result file. --- mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result b/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result index 8c29dbcd4ad..1ed7e0116a2 100644 --- a/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result +++ b/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result @@ -124,13 +124,13 @@ USE db1; INSERT INTO db1.t1 VALUES(30); INSERT INTO db1.t2 VALUES("in savepoint has_comment"); Warnings: -Note 1592 Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason for unsafeness: Non-transactional reads or writes are unsafe if they occur after transactional reads or writes inside a transaction. +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. USE db2; SavePoint mixed_cases; USE db1; INSERT INTO db1.t2 VALUES("in savepoint mixed_cases"); Warnings: -Note 1592 Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason for unsafeness: Non-transactional reads or writes are unsafe if they occur after transactional reads or writes inside a transaction. +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. INSERT INTO db1.t1 VALUES(40); USE db2; ROLLBACK TO mixed_cases; @@ -142,7 +142,7 @@ Warning 1196 Some non-transactional changed tables couldn't be rolled back USE db1; INSERT INTO db1.t2 VALUES("after rollback to"); Warnings: -Note 1592 Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason for unsafeness: Non-transactional reads or writes are unsafe if they occur after transactional reads or writes inside a transaction. +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. INSERT INTO db1.t1 VALUES(50); USE db2; COMMIT;