diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 12:33:02 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 12:33:02 +0000 |
| commit | 4fa488fb0159c629483b7994aa84e73926b132b9 (patch) | |
| tree | 182a19db69cdcb92be54cc6a5b0b9bfab28f80fd /sql/wsrep_applier.cc | |
| parent | Adding debian version 1:10.11.6-2. (diff) | |
| download | mariadb-4fa488fb0159c629483b7994aa84e73926b132b9.tar.xz mariadb-4fa488fb0159c629483b7994aa84e73926b132b9.zip | |
Merging upstream version 1:10.11.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sql/wsrep_applier.cc')
| -rw-r--r-- | sql/wsrep_applier.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc index 90ede81a..8767f698 100644 --- a/sql/wsrep_applier.cc +++ b/sql/wsrep_applier.cc @@ -204,6 +204,11 @@ int wsrep_apply_events(THD* thd, (thd->variables.option_bits & ~OPTION_SKIP_REPLICATION) | (ev->flags & LOG_EVENT_SKIP_REPLICATION_F ? OPTION_SKIP_REPLICATION : 0); + if (ev->get_type_code() == GTID_EVENT) + { + thd->variables.option_bits &= ~OPTION_GTID_BEGIN; + } + ev->thd= thd; exec_res= ev->apply_event(thd->wsrep_rgi); DBUG_PRINT("info", ("exec_event result: %d", exec_res)); |