diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-04-29 16:50:58 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-04-29 16:50:58 -0400 |
| commit | 8a1efa1bdd29b756c93a3ddbd8ad6fadec1082bc (patch) | |
| tree | 9827e75d29817f3ddbc2008ba2b5b21553c14c5e /mysql-test/extra | |
| parent | 7c42b47e67918104fddd121a1ca9fede28ed47cf (diff) | |
| parent | 9eba34f08675c31b0796eeb127582be827773070 (diff) | |
| download | mariadb-git-8a1efa1bdd29b756c93a3ddbd8ad6fadec1082bc.tar.gz | |
Merge branch '10.0' into 10.0-galera
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test b/mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test index e1faec8440b..0f46b00f683 100644 --- a/mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test +++ b/mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test @@ -375,7 +375,7 @@ source include/start_slave.inc; CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage.*"); CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_stmt_cache_size' bytes of storage.*"); CALL mtr.add_suppression("Writing one row to the row-based binary log failed.*"); -CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occured on the master. Message: error writing to the binary log"); +CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occurred on the master. Message: error writing to the binary log"); connection master; TRUNCATE t1; |