diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-03-21 13:02:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-03-21 13:02:53 +0100 |
| commit | 3b0c7ac1f9d64afc933ce0354037c709366b7dff (patch) | |
| tree | 39cefed54f79f93f82e9c33a4e094270103bf137 /mysql-test/suite/multi_source | |
| parent | e7cf898d6dc3dcac41f58db4761df3a6d1dffc03 (diff) | |
| parent | 22ebf3cb456e0d8db295e7cc93f08e3d3ecfea47 (diff) | |
| download | mariadb-git-3b0c7ac1f9d64afc933ce0354037c709366b7dff.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/suite/multi_source')
| -rw-r--r-- | mysql-test/suite/multi_source/gtid_ignore_duplicates.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/multi_source/gtid_ignore_duplicates.test b/mysql-test/suite/multi_source/gtid_ignore_duplicates.test index 1eea038f8c9..4d98b5c2ee7 100644 --- a/mysql-test/suite/multi_source/gtid_ignore_duplicates.test +++ b/mysql-test/suite/multi_source/gtid_ignore_duplicates.test @@ -337,7 +337,7 @@ START SLAVE; --source include/wait_for_slave_to_start.inc --replace_result $gtid GTID eval SELECT MASTER_GTID_WAIT("$gtid", 30); -# The bug occured here, the slave would get an out-of-order binlog error +# The bug occurred here, the slave would get an out-of-order binlog error # due to trying to re-apply the 100-x-x transaction. # Restart stopped multi-source connections, and sync up. |