Commit 3abee40e authored by Matthias Leich's avatar Matthias Leich

Fix for Bug#45902 rpl_sp fails sporadically in check testcases

Details:
- Add "sync_slave_with_master" at test end
- Restore the initial value of log_bin_trust_function_creators
parent 3cd431d5
...@@ -949,3 +949,4 @@ use test; ...@@ -949,3 +949,4 @@ use test;
drop procedure mysqltestbug36570_p1; drop procedure mysqltestbug36570_p1;
drop procedure ` mysqltestbug36570_p2`; drop procedure ` mysqltestbug36570_p2`;
drop function mysqltestbug36570_f1; drop function mysqltestbug36570_f1;
set global log_bin_trust_function_creators = 0;
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
# accepted). The old name could be removed in 5.1 or 6.0. # accepted). The old name could be removed in 5.1 or 6.0.
source include/master-slave.inc; source include/master-slave.inc;
# Save the current value and restore at end of testing
let $log_bin_trust_function_creators=
`SELECT @@global.log_bin_trust_function_creators`;
# we need a db != test, where we don't have automatic grants # we need a db != test, where we don't have automatic grants
--disable_warnings --disable_warnings
...@@ -629,3 +632,10 @@ use test; ...@@ -629,3 +632,10 @@ use test;
drop procedure mysqltestbug36570_p1; drop procedure mysqltestbug36570_p1;
drop procedure ` mysqltestbug36570_p2`; drop procedure ` mysqltestbug36570_p2`;
drop function mysqltestbug36570_f1; drop function mysqltestbug36570_f1;
# Cleanup
sync_slave_with_master;
# Restore the initial value of log_bin_trust_function_creators
eval
set global log_bin_trust_function_creators = $log_bin_trust_function_creators;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment