diff options
| author | Sven Sandberg <sven.sandberg@oracle.com> | 2010-12-19 18:15:12 +0100 |
|---|---|---|
| committer | Sven Sandberg <sven.sandberg@oracle.com> | 2010-12-19 18:15:12 +0100 |
| commit | e37c86de18ba627f8c055e4a1b0923fb1f0a55de (patch) | |
| tree | 91a12675003778cd8ccbccea5ce47ee09fc46efc /mysql-test/extra/rpl_tests/rpl_deadlock.test | |
| parent | 7d5df402778b7e5c1df06f3dcaf499612d628a7c (diff) | |
| parent | 09c80e12c535b080eaf914ed25dbf79546494030 (diff) | |
| download | mariadb-git-e37c86de18ba627f8c055e4a1b0923fb1f0a55de.tar.gz | |
Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.
Diffstat (limited to 'mysql-test/extra/rpl_tests/rpl_deadlock.test')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_deadlock.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_deadlock.test b/mysql-test/extra/rpl_tests/rpl_deadlock.test index 607348ae97b..bd446c86943 100644 --- a/mysql-test/extra/rpl_tests/rpl_deadlock.test +++ b/mysql-test/extra/rpl_tests/rpl_deadlock.test @@ -131,3 +131,4 @@ sync_slave_with_master; SET global max_relay_log_size= @my_max_relay_log_size; --echo End of 5.1 tests +--source include/rpl_end.inc |