summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-08-31 11:41:59 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-08-31 12:36:31 +0300
commit3b5d3cd68e4acceb613822adc66b87f396920e59 (patch)
treec14aa4b07c06f2688a74eeaa6416fab2c4e85400 /sql/mysqld.cc
parentc933970974bd5a30fb824c1df64c68f1bc403389 (diff)
downloadmariadb-git-3b5d3cd68e4acceb613822adc66b87f396920e59.tar.gz
Revert MDEV-9519 due to regressions
This reverts commit 75dfd4acb995789ca5f86ccbd361fff9d2797e79.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc14
1 files changed, 0 insertions, 14 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index a65f430f74e..34bb75cbfba 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4192,20 +4192,6 @@ static int init_common_variables()
DBUG_PRINT("info",("%s Ver %s for %s on %s\n",my_progname,
server_version, SYSTEM_TYPE,MACHINE_TYPE));
-#ifdef WITH_WSREP
- /*
- We need to initialize auxiliary variables, that will be
- further keep the original values of auto-increment options
- as they set by the user. These variables used to restore
- user-defined values of the auto-increment options after
- setting of the wsrep_auto_increment_control to 'OFF'.
- */
- global_system_variables.saved_auto_increment_increment=
- global_system_variables.auto_increment_increment;
- global_system_variables.saved_auto_increment_offset=
- global_system_variables.auto_increment_offset;
-#endif /* WITH_WSREP */
-
#ifdef HAVE_LARGE_PAGES
/* Initialize large page size */
if (opt_large_pages)