diff options
author | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-08-06 10:23:53 +0300 |
---|---|---|
committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-08-07 10:09:12 +0300 |
commit | 14731d7635d42878796733f898bbcf5d0022e69b (patch) | |
tree | d3a01c89928fdcfd8bcbe5e853cf3c36eeb1360d | |
parent | 5982734eac96c8cc360909e3c2c10257a0776046 (diff) | |
download | mariadb-git-14731d7635d42878796733f898bbcf5d0022e69b.tar.gz |
MDEV-24843 : Remove parameter wsrep_strict_ddl
Changes to be committed:
modified: mysql-test/include/galera_variables_ok.inc
modified: mysql-test/include/galera_variables_ok_debug.inc
modified: mysql-test/suite/galera/r/galera_defaults.result
deleted: mysql-test/suite/galera/r/galera_var_wsrep_strict_ddl.result
modified: mysql-test/suite/galera/t/galera_defaults.test
deleted: mysql-test/suite/galera/t/galera_var_wsrep_strict_ddl.test
modified: mysql-test/suite/sys_vars/r/sysvars_wsrep.result
modified: mysql-test/suite/wsrep/r/variables.result
modified: mysql-test/suite/wsrep/r/variables_debug.result
modified: sql/sys_vars.cc
modified: sql/wsrep_mysqld.cc
modified: sql/wsrep_mysqld.h
modified: sql/wsrep_var.cc
modified: sql/wsrep_var.h
-rw-r--r-- | mysql-test/include/galera_variables_ok.inc | 2 | ||||
-rw-r--r-- | mysql-test/include/galera_variables_ok_debug.inc | 2 | ||||
-rw-r--r-- | mysql-test/suite/galera/r/galera_defaults.result | 7 | ||||
-rw-r--r-- | mysql-test/suite/galera/r/galera_var_wsrep_strict_ddl.result | 26 | ||||
-rw-r--r-- | mysql-test/suite/galera/t/galera_defaults.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/galera/t/galera_var_wsrep_strict_ddl.test | 13 | ||||
-rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_wsrep.result | 15 | ||||
-rw-r--r-- | mysql-test/suite/wsrep/r/variables.result | 3 | ||||
-rw-r--r-- | mysql-test/suite/wsrep/r/variables_debug.result | 2 | ||||
-rw-r--r-- | sql/sys_vars.cc | 10 | ||||
-rw-r--r-- | sql/wsrep_mysqld.cc | 3 | ||||
-rw-r--r-- | sql/wsrep_mysqld.h | 1 | ||||
-rw-r--r-- | sql/wsrep_var.cc | 13 | ||||
-rw-r--r-- | sql/wsrep_var.h | 1 |
14 files changed, 9 insertions, 91 deletions
diff --git a/mysql-test/include/galera_variables_ok.inc b/mysql-test/include/galera_variables_ok.inc index 82c5174bc14..c9a54724c17 100644 --- a/mysql-test/include/galera_variables_ok.inc +++ b/mysql-test/include/galera_variables_ok.inc @@ -1,6 +1,6 @@ --disable_query_log ---let $galera_variables_ok = `SELECT COUNT(*) = 49 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep%'` +--let $galera_variables_ok = `SELECT COUNT(*) = 50 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep%'` --if (!$galera_variables_ok) { --skip Galera number of variables has changed! diff --git a/mysql-test/include/galera_variables_ok_debug.inc b/mysql-test/include/galera_variables_ok_debug.inc index c9a54724c17..e420b3af6c3 100644 --- a/mysql-test/include/galera_variables_ok_debug.inc +++ b/mysql-test/include/galera_variables_ok_debug.inc @@ -1,6 +1,6 @@ --disable_query_log ---let $galera_variables_ok = `SELECT COUNT(*) = 50 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep%'` +--let $galera_variables_ok = `SELECT COUNT(*) = 51 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep%'` --if (!$galera_variables_ok) { --skip Galera number of variables has changed! diff --git a/mysql-test/suite/galera/r/galera_defaults.result b/mysql-test/suite/galera/r/galera_defaults.result index bc9927b21d9..063cc601f20 100644 --- a/mysql-test/suite/galera/r/galera_defaults.result +++ b/mysql-test/suite/galera/r/galera_defaults.result @@ -1,9 +1,9 @@ connection node_2; connection node_1; # Correct Galera library found -SELECT COUNT(*) `expect 51` FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep_%'; -expect 51 -51 +SELECT COUNT(*) `expect 50` FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep_%'; +expect 50 +50 SELECT VARIABLE_NAME, VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep_%' @@ -58,7 +58,6 @@ WSREP_SST_AUTH WSREP_SST_DONOR WSREP_SST_DONOR_REJECTS_QUERIES OFF WSREP_SST_METHOD rsync -WSREP_STRICT_DDL OFF WSREP_SYNC_WAIT 15 WSREP_TRX_FRAGMENT_SIZE 0 WSREP_TRX_FRAGMENT_UNIT bytes diff --git a/mysql-test/suite/galera/r/galera_var_wsrep_strict_ddl.result b/mysql-test/suite/galera/r/galera_var_wsrep_strict_ddl.result deleted file mode 100644 index d53708b3504..00000000000 --- a/mysql-test/suite/galera/r/galera_var_wsrep_strict_ddl.result +++ /dev/null @@ -1,26 +0,0 @@ -connection node_2; -connection node_1; -SELECT @@global.wsrep_mode; -@@global.wsrep_mode - -SELECT @@global.wsrep_strict_ddl; -@@global.wsrep_strict_ddl -0 -SET @@global.wsrep_strict_ddl=ON; -Warnings: -Warning 1287 '@@wsrep_strict_ddl' is deprecated and will be removed in a future release. Please use '@@wsrep_mode=STRICT_REPLICATION' instead -SELECT @@global.wsrep_mode; -@@global.wsrep_mode -STRICT_REPLICATION -SELECT @@global.wsrep_strict_ddl; -@@global.wsrep_strict_ddl -1 -SET @@global.wsrep_strict_ddl=OFF; -Warnings: -Warning 1287 '@@wsrep_strict_ddl' is deprecated and will be removed in a future release. Please use '@@wsrep_mode=STRICT_REPLICATION' instead -SELECT @@global.wsrep_mode; -@@global.wsrep_mode - -SELECT @@global.wsrep_strict_ddl; -@@global.wsrep_strict_ddl -0 diff --git a/mysql-test/suite/galera/t/galera_defaults.test b/mysql-test/suite/galera/t/galera_defaults.test index 96389e44d3f..6b76473d6a6 100644 --- a/mysql-test/suite/galera/t/galera_defaults.test +++ b/mysql-test/suite/galera/t/galera_defaults.test @@ -18,7 +18,7 @@ source ../wsrep/include/check_galera_version.inc; # Global Variables -SELECT COUNT(*) `expect 51` FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep_%'; +SELECT COUNT(*) `expect 50` FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep_%'; SELECT VARIABLE_NAME, VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES diff --git a/mysql-test/suite/galera/t/galera_var_wsrep_strict_ddl.test b/mysql-test/suite/galera/t/galera_var_wsrep_strict_ddl.test deleted file mode 100644 index 2aa76d46f82..00000000000 --- a/mysql-test/suite/galera/t/galera_var_wsrep_strict_ddl.test +++ /dev/null @@ -1,13 +0,0 @@ ---source include/galera_cluster.inc - -SELECT @@global.wsrep_mode; -SELECT @@global.wsrep_strict_ddl; - -SET @@global.wsrep_strict_ddl=ON; -SELECT @@global.wsrep_mode; -SELECT @@global.wsrep_strict_ddl; - -SET @@global.wsrep_strict_ddl=OFF; -SELECT @@global.wsrep_mode; -SELECT @@global.wsrep_strict_ddl; - diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result index 6bea1a88caa..2a46ba9f34c 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result @@ -721,21 +721,6 @@ ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED GLOBAL_VALUE_PATH NULL -VARIABLE_NAME WSREP_STRICT_DDL -SESSION_VALUE NULL -GLOBAL_VALUE OFF -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT If set, reject DDL on affected tables not supporting Galera replication -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST OFF,ON -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL -GLOBAL_VALUE_PATH NULL VARIABLE_NAME WSREP_SYNC_WAIT SESSION_VALUE 0 GLOBAL_VALUE 0 diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result index 82c480917f1..7a19accc24f 100644 --- a/mysql-test/suite/wsrep/r/variables.result +++ b/mysql-test/suite/wsrep/r/variables.result @@ -105,8 +105,6 @@ WSREP_FORCED_BINLOG_FORMAT WSREP_GTID_DOMAIN_ID WSREP_GTID_MODE WSREP_GTID_SEQ_NO -WSREP_MODE -WSREP_STRICT_DDL WSREP_IGNORE_APPLY_ERRORS WSREP_LOAD_DATA_SPLITTING WSREP_LOG_CONFLICTS @@ -138,7 +136,6 @@ WSREP_SST_DONOR_REJECTS_QUERIES WSREP_SST_METHOD WSREP_SST_RECEIVE_ADDRESS WSREP_START_POSITION -WSREP_STRICT_DDL WSREP_SYNC_WAIT WSREP_TRX_FRAGMENT_SIZE WSREP_TRX_FRAGMENT_UNIT diff --git a/mysql-test/suite/wsrep/r/variables_debug.result b/mysql-test/suite/wsrep/r/variables_debug.result index fe2bffb3f08..d80e0642ed5 100644 --- a/mysql-test/suite/wsrep/r/variables_debug.result +++ b/mysql-test/suite/wsrep/r/variables_debug.result @@ -105,11 +105,13 @@ WSREP_DRUPAL_282555_WORKAROUND WSREP_FORCED_BINLOG_FORMAT WSREP_GTID_DOMAIN_ID WSREP_GTID_MODE +WSREP_GTID_SEQ_NO WSREP_IGNORE_APPLY_ERRORS WSREP_LOAD_DATA_SPLITTING WSREP_LOG_CONFLICTS WSREP_MAX_WS_ROWS WSREP_MAX_WS_SIZE +WSREP_MODE WSREP_MYSQL_REPLICATION_BUNDLE WSREP_NODE_ADDRESS WSREP_NODE_INCOMING_ADDRESS diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 34ac95b941d..2309144ebf2 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -6031,16 +6031,6 @@ static Sys_var_mybool Sys_wsrep_desync ( ON_CHECK(wsrep_desync_check), ON_UPDATE(wsrep_desync_update)); -static Sys_var_mybool Sys_wsrep_strict_ddl ( - "wsrep_strict_ddl", - "If set, reject DDL on affected tables not supporting Galera replication", - GLOBAL_VAR(wsrep_strict_ddl), - CMD_LINE(OPT_ARG), DEFAULT(FALSE), - NO_MUTEX_GUARD, NOT_IN_BINLOG, - ON_CHECK(0), - ON_UPDATE(wsrep_strict_ddl_update), - DEPRECATED("'@@wsrep_mode=STRICT_REPLICATION'")); // since 10.6.0 - static const char *wsrep_reject_queries_names[]= { "NONE", "ALL", "ALL_KILL", NullS }; static Sys_var_enum Sys_wsrep_reject_queries( "wsrep_reject_queries", "Variable to set to reject queries", diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 0f2fa131f0a..7910a4ccf5e 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -100,9 +100,6 @@ my_bool wsrep_restart_slave; // Should mysql slave thread be my_bool wsrep_desync; // De(re)synchronize the node from the // cluster ulonglong wsrep_mode; -my_bool wsrep_strict_ddl; // Deprecated: Reject DDL to - // effected tables not - // supporting Galera replication bool wsrep_service_started; // If Galera was initialized long wsrep_slave_threads; // No. of slave appliers threads ulong wsrep_retry_autocommit; // Retry aborted autocommit trx diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 082a65bbad8..4d741be2799 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -103,7 +103,6 @@ extern bool wsrep_new_cluster; extern bool wsrep_gtid_mode; extern uint wsrep_gtid_domain_id; extern ulonglong wsrep_mode; -extern my_bool wsrep_strict_ddl; enum enum_wsrep_reject_types { WSREP_REJECT_NONE, /* nothing rejected */ diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index 386da305a26..3e7b57b298a 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -1,4 +1,4 @@ -/* Copyright 2008-2015 Codership Oy <http://www.codership.com> +/* Copyright 2008-2021 Codership Oy <http://www.codership.com> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1100,17 +1100,6 @@ bool wsrep_gtid_domain_id_update(sys_var* self, THD *thd, enum_var_type) return false; } -bool wsrep_strict_ddl_update(sys_var *self, THD* thd, enum_var_type var_type) -{ - // In case user still sets wsrep_strict_ddl we set new - // option to wsrep_mode - if (wsrep_strict_ddl) - wsrep_mode|= WSREP_MODE_STRICT_REPLICATION; - else - wsrep_mode&= (~WSREP_MODE_STRICT_REPLICATION); - return false; -} - bool wsrep_replicate_myisam_update(sys_var *self, THD* thd, enum_var_type var_type) { // In case user still sets wsrep_replicate_myisam we set new diff --git a/sql/wsrep_var.h b/sql/wsrep_var.h index 7908e873795..f425deb9dc6 100644 --- a/sql/wsrep_var.h +++ b/sql/wsrep_var.h @@ -109,7 +109,6 @@ extern bool wsrep_gtid_seq_no_check CHECK_ARGS; extern bool wsrep_gtid_domain_id_update UPDATE_ARGS; extern bool wsrep_mode_check CHECK_ARGS; -extern bool wsrep_strict_ddl_update UPDATE_ARGS; extern bool wsrep_replicate_myisam_update UPDATE_ARGS; #else /* WITH_WSREP */ |