diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
| commit | 2e4984c185ddcd2da789017cd147338846ff409a (patch) | |
| tree | 0293831900c860600efbaa747ea886d9d1cbf5bd /mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test | |
| parent | 792b53e80806df893ee62c9a1c1bd117114c8c6d (diff) | |
| parent | a6087e7dc1ef3561d8189c8db15e9591d0f9b520 (diff) | |
| download | mariadb-git-2e4984c185ddcd2da789017cd147338846ff409a.tar.gz | |
Merge tag 'mariadb-10.0.20' into 10.0-FusionIO10.0-FusionIO
Conflicts:
storage/innobase/os/os0file.cc
storage/xtradb/os/os0file.cc
storage/xtradb/srv/srv0start.cc
Diffstat (limited to 'mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test b/mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test index 31492b7c096..9739ba8bc43 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test @@ -230,7 +230,7 @@ CALL mtr.add_suppression("Slave: Could not update replication slave gtid state") SET sql_log_bin=1; ---echo *** MDEV-4906: When event apply fails, next SQL thread start errorneously commits the failing GTID to gtid_slave_pos *** +--echo *** MDEV-4906: When event apply fails, next SQL thread start erroneously commits the failing GTID to gtid_slave_pos *** --connection slave --source include/stop_slave.inc |