diff options
| author | Matthias Leich <Matthias.Leich@sun.com> | 2009-07-02 13:22:12 +0200 |
|---|---|---|
| committer | Matthias Leich <Matthias.Leich@sun.com> | 2009-07-02 13:22:12 +0200 |
| commit | 90c97d7ccc7d3a499f8bda04f38e56ba3c951b2b (patch) | |
| tree | ea02174012186918658cc5351cfabcba18c15bac /mysql-test | |
| parent | 490f443221108903d497b387bc8a16029b83601c (diff) | |
| download | mariadb-git-90c97d7ccc7d3a499f8bda04f38e56ba3c951b2b.tar.gz | |
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
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_sp.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_sp.test | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_sp.result b/mysql-test/r/rpl_sp.result index 0f4d0fa8dad..7f1ae19035f 100644 --- a/mysql-test/r/rpl_sp.result +++ b/mysql-test/r/rpl_sp.result @@ -949,3 +949,4 @@ use test; drop procedure mysqltestbug36570_p1; drop procedure ` mysqltestbug36570_p2`; drop function mysqltestbug36570_f1; +set global log_bin_trust_function_creators = 0; diff --git a/mysql-test/t/rpl_sp.test b/mysql-test/t/rpl_sp.test index f045257d279..6ac6729e662 100644 --- a/mysql-test/t/rpl_sp.test +++ b/mysql-test/t/rpl_sp.test @@ -7,6 +7,9 @@ # accepted). The old name could be removed in 5.1 or 6.0. 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 --disable_warnings @@ -629,3 +632,10 @@ use test; drop procedure mysqltestbug36570_p1; drop procedure ` mysqltestbug36570_p2`; 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; + |