merged fixes for BUG#39934 to 5.1-rpl+3

Also renamed current_stmt_binlog_row_based to
current_stmt_binlog_format_row for consistency

mysql-test/t/mysqldump.test

@@ -875,8 +875,13 @@ select * from t1;
 create  view v1 as
 select * from v3 where b in (1, 2, 3, 4, 5, 6, 7);
 
+# Disable warnings since LIMIT warning for unsafe statement if
+# binlog_format = STATEMENT. Note: after BUG#45832, the warning should
+# not be issued.
+--disable_warnings
 create  view v2 as
 select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1;
+--enable_warnings
 
 --exec $MYSQL_DUMP --skip-comments test
 

mysql-test/t/partition_innodb_stmt.test

@@ -50,7 +50,7 @@ connection con1;
 --echo # connection con1
 SET TRANSACTION ISOLATION LEVEL READ COMMITTED;
 BEGIN;
---error ER_BINLOG_LOGGING_IMPOSSIBLE
+--error ER_BINLOG_STMT_MODE_AND_ROW_ENGINE
 INSERT INTO t1 VALUES(9);
 COMMIT;