1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for Bug#45902 rpl_sp fails sporadically in check testcases

Browse Source 
Details:
- Add "sync_slave_with_master" at test end
- Restore the initial value of log_bin_trust_function_creators
This commit is contained in:
Matthias Leich 2009-07-02 13:22:12 +02:00
parent 3cd431d553
commit 3abee40e6b
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/rpl_sp.result
View File

@ -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;

10
mysql-test/t/rpl_sp.test
View File

@ -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;
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;