diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-09 14:53:34 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-09 14:53:34 +0300 |
| commit | 6dea701e0f666b8643d6103972bda2844bae8b5f (patch) | |
| tree | 95fd82ef86a553263b19dc324be6b0137bbf78f9 /sql/slave.cc | |
| parent | e74858c8a8777097c76b742f6d88a7c07c3a9498 (diff) | |
| parent | 62419b1733042c30414a4feed89c79aebb5621af (diff) | |
| download | mariadb-git-6dea701e0f666b8643d6103972bda2844bae8b5f.tar.gz | |
Merge 10.8 into 10.9
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 19037525422..5c746271cf5 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 @@ -6791,8 +6791,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= - 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 || |