diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-01-09 09:03:39 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-01-09 09:03:39 +0200 |
| commit | 49b87749513fd931eb874d4559b34ed6aeec8f05 (patch) | |
| tree | a3091e3fbc57696abb2dea962e57c795c1535a58 /sql/sys_vars.cc | |
| parent | fae87e0c74a02cebcafe69c3546a82da2ec1611d (diff) | |
| download | mariadb-git-49b87749513fd931eb874d4559b34ed6aeec8f05.tar.gz | |
MDEV-24546 : AddressSanitizer: initialization-order-fiasco on address ... in Sys_var_integer from __static_initialization_and_destruction_0, possibly inside global var wsrep_gtid_server
Galera parameter wsrep_gtid_domain_id was defined using a class where
actual parameter was not a first member. Fixed this by using normal
variable and assigning this value to class member value.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 44d29c5da0b..12b6ea96182 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -6051,8 +6051,10 @@ static Sys_var_uint Sys_wsrep_gtid_domain_id( "wsrep_gtid_domain_id", "When wsrep_gtid_mode is set, this value is " "used as gtid_domain_id for galera transactions and also copied to the " "joiner nodes during state transfer. It is ignored, otherwise.", - GLOBAL_VAR(wsrep_gtid_server.domain_id), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, UINT_MAX32), DEFAULT(0), BLOCK_SIZE(1)); + GLOBAL_VAR(wsrep_gtid_domain_id), CMD_LINE(REQUIRED_ARG), + VALID_RANGE(0, UINT_MAX32), DEFAULT(0), BLOCK_SIZE(1), + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), + ON_UPDATE(wsrep_gtid_domain_id_update)); static Sys_var_ulonglong Sys_wsrep_gtid_seq_no( "wsrep_gtid_seq_no", |