diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-28 12:22:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-28 12:22:32 +0300 |
| commit | f740d23ce6574bf57449aa48b22d6345f35ad2c0 (patch) | |
| tree | 85eb18f1464b3dc76e571354401a2072cb8c8ba0 /sql/slave.cc | |
| parent | e21c15a7e626b5c01d9770d82aaed56053c7baef (diff) | |
| parent | 97e0c260dc8273f809915505f8dfdccd948b4b99 (diff) | |
| download | mariadb-git-f740d23ce6574bf57449aa48b22d6345f35ad2c0.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index fbdb78b5c5d..7e7144f08e7 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3977,7 +3977,8 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli, DBUG_RETURN(1); } - if (opt_gtid_ignore_duplicates) + if (opt_gtid_ignore_duplicates && + rli->mi->using_gtid != Master_info::USE_GTID_NO) { int res= rpl_global_gtid_slave_state->check_duplicate_gtid (&serial_rgi->current_gtid, serial_rgi); |