Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR

Fix tests for new behaviour: an error is thrown if a NON DETERMINISTIC
stored function (SF) is called during statement-based replication (SBR).

1 files changed, 6 insertions, 3 deletions

diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test
index 99da1fa1ee7..a533af995dc 100644
--- a/mysql-test/t/grant2.test
+++ b/mysql-test/t/grant2.test
@@ -484,6 +484,8 @@ flush privileges;
 # BUG#13310 incorrect user parsing by SP
 #
 
+SET GLOBAL log_bin_trust_function_creators = 1;
+
 grant all privileges on test.* to `a@`@localhost;
 grant execute on * to `a@`@localhost;
 connect (bug13310,localhost,'a@',,test);
@@ -494,11 +496,10 @@ insert into t2 values (1);
 drop function if exists f2;
 --enable_warnings
 delimiter //;
-create function f2 () returns int begin declare v int; select s1 from t2
-into v; return v; end//
+create function f2 () returns int
+begin declare v int; select s1 from t2 into v; return v; end//
 delimiter ;//
 select f2();
-
 drop function f2;
 drop table t2;
 disconnect bug13310;
@@ -506,3 +507,5 @@ disconnect bug13310;
 connection default;
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM `a@`@localhost;
 drop user `a@`@localhost;
+
+SET GLOBAL log_bin_trust_function_creators = 0;