lots of post-merge changes

1 files changed, 2 insertions, 2 deletions

diff --git a/mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result b/mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
index a3784562adb..458805a9157 100644
--- a/mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
@@ -76,10 +76,10 @@ insert into t1 values (1,1,1);
 insert into t1 values (RAND()*1000+10, RAND()*1000+10, RAND()*1000+10);
 update t1 set n1=rand() where n1=1;
 Warnings:
-Note	1592	Statement may not be safe to log in statement format.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
 delete from t1 where n2=1 + rand()*0;
 Warnings:
-Note	1592	Statement may not be safe to log in statement format.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
 drop table t1;
 DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (a int);