Merge 10.3 into 10.4

1 files changed, 18 insertions, 0 deletions

diff --git a/sql/wsrep_thd.cc b/sql/wsrep_thd.cc
index 556163ad03d..b849bc256cb 100644
--- a/sql/wsrep_thd.cc
+++ b/sql/wsrep_thd.cc
@@ -397,3 +397,21 @@ bool wsrep_bf_abort(const THD* bf_thd, THD* victim_thd)
   return ret;
 }
 
+/*
+  Get auto increment variables for THD. Use global settings for
+  applier threads.
+ */
+void wsrep_thd_auto_increment_variables(THD* thd,
+                                        unsigned long long* offset,
+                                        unsigned long long* increment)
+{
+  if (wsrep_thd_is_applying(thd) &&
+      thd->wsrep_trx().state() != wsrep::transaction::s_replaying)
+  {
+    *offset= global_system_variables.auto_increment_offset;
+    *increment= global_system_variables.auto_increment_increment;
+    return;
+  }
+  *offset= thd->variables.auto_increment_offset;
+  *increment= thd->variables.auto_increment_increment;
+}