summaryrefslogtreecommitdiff
path: root/sql/wsrep_mysqld.cc
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-12-28 19:27:00 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-12-28 19:27:00 +0200
commit9aeb5d01d6bb1506febfcab6ef9d78417efa87df (patch)
tree96602fb6d88d8a14a69d27aa241fe0e59e2ebc3e /sql/wsrep_mysqld.cc
parent14de2ad3cb4e1f8f48b83d5e9aafa4e3a366d152 (diff)
parent7e4c185c774cabaa1912760e143d9385ce959eea (diff)
downloadmariadb-git-9aeb5d01d6bb1506febfcab6ef9d78417efa87df.tar.gz
Merge remote-tracking branch 'origin/10.1' into bb-10.2-vicentiu
Diffstat (limited to 'sql/wsrep_mysqld.cc')
-rw-r--r--sql/wsrep_mysqld.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 2ac158817cb..76c753cf0b4 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -1252,6 +1252,16 @@ int wsrep_to_buf_helper(
if (!ret && writer.write(&gtid_ev)) ret= 1;
}
#endif /* GTID_SUPPORT */
+ if (wsrep_gtid_mode && thd->variables.gtid_seq_no)
+ {
+ Gtid_log_event gtid_event(thd, thd->variables.gtid_seq_no,
+ thd->variables.gtid_domain_id,
+ true, LOG_EVENT_SUPPRESS_USE_F,
+ true, 0);
+ gtid_event.server_id= thd->variables.server_id;
+ if (!gtid_event.is_valid()) ret= 0;
+ ret= writer.write(&gtid_event);
+ }
/* if there is prepare query, add event for it */
if (!ret && thd->wsrep_TOI_pre_query)