diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-17 19:39:05 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-17 19:39:05 +0200 |
| commit | 94b45787045677c106a25ebb5aaf1273040b2ff6 (patch) | |
| tree | 4231461f1f43bc3dd1335c7f7738cd85d2957621 /sql/wsrep_sst.cc | |
| parent | 66b8edf8a57c106b15ef1de2b25ce3e992540b71 (diff) | |
| parent | 16388f393c63b3e2158db1efec8dd9625a0a295e (diff) | |
| download | mariadb-git-94b45787045677c106a25ebb5aaf1273040b2ff6.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/wsrep_sst.cc')
| -rw-r--r-- | sql/wsrep_sst.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index c78a9359704..0fca31bd4ea 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -266,6 +266,12 @@ static bool sst_auth_real_set (const char* value) if (wsrep_sst_auth) { my_free((void*) wsrep_sst_auth); } wsrep_sst_auth= my_strdup(PSI_INSTRUMENT_ME, WSREP_SST_AUTH_MASK, MYF(0)); } + else + { + if (wsrep_sst_auth) { my_free((void*) wsrep_sst_auth); } + wsrep_sst_auth= NULL; + } + return 0; } return 1; |