diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 12:43:02 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 12:43:02 +0300 |
commit | 22c322c649d5a15e3bb731d6751a0d80c8ec23b0 (patch) | |
tree | 11073f6169c237da226a977736d234c7c7b5c163 /sql/wsrep_sst.cc | |
parent | 7d49aab32c3733f26cff8d83396a65bd120352e8 (diff) | |
parent | ec6042bda097fa53c43caf4a1acc32c5a77f6ed4 (diff) | |
download | mariadb-git-22c322c649d5a15e3bb731d6751a0d80c8ec23b0.tar.gz |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/wsrep_sst.cc')
-rw-r--r-- | sql/wsrep_sst.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index 05cf36fd9dc..8626cb07196 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -434,7 +434,7 @@ static int generate_binlog_opt_val(char** ret) { assert(opt_bin_logname); *ret= strcmp(opt_bin_logname, "0") ? - my_strdup(opt_bin_logname, MYF(0)) : my_strdup("", MYF(0)); + my_strdup(opt_bin_logname, MYF(0)) : my_strdup("", MYF(0)); } else { |