Merge 10.1 into 10.2

1 files changed, 11 insertions, 0 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index 4888b38bc30..9a10083a998 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -569,6 +569,17 @@ typedef struct system_variables
   ha_rows max_join_size;
   ha_rows expensive_subquery_limit;
   ulong auto_increment_increment, auto_increment_offset;
+#ifdef WITH_WSREP
+  /*
+    Variables with stored values of the auto_increment_increment
+    and auto_increment_offset options that are will be needed when
+    wsrep_auto_increment_control will be set to 'OFF', because the
+    setting it to 'ON' leads to overwriting of the original values
+    (which are set by the user) by calculated values (which are
+    based on the cluster's size):
+  */
+  ulong saved_auto_increment_increment, saved_auto_increment_offset;
+#endif /* WITH_WSREP */
   uint eq_range_index_dive_limit;
   ulong lock_wait_timeout;
   ulong join_cache_level;