diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-02 13:02:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-02 13:02:26 +0300 |
| commit | 15dcb8bd3e80d233107a6ad17751d46e1839cf85 (patch) | |
| tree | 6aac86ed548ad3e3d9ceba77353da642be3fe526 /sql/wsrep_sst.cc | |
| parent | 617dee34886987c53b14e09a9ee73abe923a18e4 (diff) | |
| parent | c294443b41bff54eb11ac68f23b9366c0cb9ef90 (diff) | |
| download | mariadb-git-15dcb8bd3e80d233107a6ad17751d46e1839cf85.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/wsrep_sst.cc')
| -rw-r--r-- | sql/wsrep_sst.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index 32ea506f5ea..862a446c70f 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -1055,6 +1055,8 @@ static ssize_t sst_prepare_other (const char* method, { WSREP_ERROR("sst_prepare_other(): generate_binlog_index_opt_val() failed %d", ret); + if (binlog_opt_val) my_free(binlog_opt_val); + return ret; } make_wsrep_defaults_file(); @@ -1072,6 +1074,7 @@ static ssize_t sst_prepare_other (const char* method, wsrep_defaults_file, (int)getpid(), binlog_opt_val, binlog_index_opt_val); + my_free(binlog_opt_val); my_free(binlog_index_opt_val); @@ -1798,6 +1801,8 @@ static int sst_donate_other (const char* method, { WSREP_ERROR("sst_prepare_other(): generate_binlog_index_opt_val() failed %d", ret); + if (binlog_opt_val) my_free(binlog_opt_val); + return ret; } make_wsrep_defaults_file(); |