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
This commit is contained in:
Jan Lindström
parent
5982734eac
commit
14731d7635
@ -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!
|
||||
|
||||
@ -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!
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 */
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 */
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user