diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-03 13:36:12 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-03 13:36:12 -0400 |
| commit | ba4ed3ee8478830fb94e99dcd5a5acfcc3e2c3ea (patch) | |
| tree | dd9f6f51c94566ffa376b6653d8542f685e3641c /sql/wsrep_sst.cc | |
| parent | 08683a726773f8cdf16a4a3dfb3920e5f7842481 (diff) | |
| download | mariadb-git-ba4ed3ee8478830fb94e99dcd5a5acfcc3e2c3ea.tar.gz | |
MDEV-10492: Assertion failure on shutdown when wsrep_sst_auth set in config
The memory alloc-ed initially for wsrep_sst_auth to store the
value specified in config was lost as the global variable was
reset while in process of masking it and thus, could never be
reclaimed on shutdown.
Diffstat (limited to 'sql/wsrep_sst.cc')
| -rw-r--r-- | sql/wsrep_sst.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index 2b682a1aded..ba6bb18bf37 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -169,10 +169,9 @@ bool wsrep_sst_auth_update (sys_var *self, THD* thd, enum_var_type type) return sst_auth_real_set (wsrep_sst_auth); } -void wsrep_sst_auth_init (const char* value) +void wsrep_sst_auth_init () { - if (wsrep_sst_auth == value) wsrep_sst_auth = NULL; - if (value) sst_auth_real_set (value); + sst_auth_real_set(wsrep_sst_auth); } bool wsrep_sst_donor_check (sys_var *self, THD* thd, set_var* var) |