diff options
| author | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-02-22 18:25:17 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-02-23 11:57:27 +0530 |
| commit | ba92f6ceb2eec0bd2952e7b65bae4a44bfa2745b (patch) | |
| tree | aa268897b0c1231d77022b07198954665031722b /sql/wsrep_var.cc | |
| parent | ec9a48112b3caac39fb133d524f499172942d43a (diff) | |
| download | mariadb-git-bb-5.5-mdev-12109.tar.gz | |
Mdev-12109 Merge 5.5.55 to 5.5-galerabb-5.5-mdev-12109
Merged https://github.com/codership/mysql-wsrep/tree/5.5 up to commit 03c22517c87.
Diffstat (limited to 'sql/wsrep_var.cc')
| -rw-r--r-- | sql/wsrep_var.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index 66b33e7697c..6385fa926a2 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -185,9 +185,8 @@ static bool refresh_provider_options() char* opts= wsrep->options_get(wsrep); if (opts) { - if (wsrep_provider_options) my_free((void *)wsrep_provider_options); - wsrep_provider_options = (char*)my_memdup(opts, strlen(opts) + 1, - MYF(MY_WME)); + wsrep_provider_options_init(opts); + free(opts); } else { |