diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-09 13:34:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-09 13:34:52 +0300 |
| commit | e11b82f8f5c7006f7bf271f0db8e8c514cc9baad (patch) | |
| tree | d44b413b5cd14a296a0069eea9e82c1f26f3b61e /sql/slave.cc | |
| parent | 77b3959b5c1528f33ada7aa4445cccf5b5e197b0 (diff) | |
| parent | a9d0bb12e68a11c119a3534f354c7a7ef13dd5b5 (diff) | |
| download | mariadb-git-e11b82f8f5c7006f7bf271f0db8e8c514cc9baad.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 8818029d444..9321598d06d 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2017, Oracle and/or its affiliates. - Copyright (c) 2009, 2021, MariaDB Corporation. + Copyright (c) 2009, 2022, MariaDB Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -6718,8 +6718,8 @@ static int queue_event(Master_info* mi, const uchar *buf, ulong event_len) can be satisfied only with the strict mode that ensures against "genuine" gtid duplicates. */ - rpl_gtid *gtid_in_slave_state __attribute__((unused))= - mi->gtid_current_pos.find(mi->last_queued_gtid.domain_id); + IF_DBUG(rpl_gtid *gtid_in_slave_state= + mi->gtid_current_pos.find(mi->last_queued_gtid.domain_id),); // Slave gtid state must not have updated yet to the last received gtid. DBUG_ASSERT((mi->using_gtid == Master_info::USE_GTID_NO || |