diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-05-05 16:12:54 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-05-05 16:12:54 +0400 |
| commit | ac53b49b1be807f588aebd83883ec93b764f5d54 (patch) | |
| tree | c86cbdb535eefb15e2077a7ac2ffaeff9d76955e /sql/slave.cc | |
| parent | 583b68e89961c35fa95a06c38988f82e33c73f4a (diff) | |
| parent | db0917f68f2681882974afd53935aa8cba29c6b8 (diff) | |
| download | mariadb-git-ac53b49b1be807f588aebd83883ec93b764f5d54.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
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 3ebd1b2ec46..b28bc1d8dc5 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); |