diff options
| author | mkaruza <mario.karuza@galeracluster.com> | 2019-02-15 11:31:29 +0100 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-02-18 11:05:40 +0200 |
| commit | 54ffc4996a6b9ffd400177864c0b33b49b0c4bcf (patch) | |
| tree | 1ccae9e011868b4a1e641644d6cf21a8adbc6ae9 /sql/wsrep_sst.cc | |
| parent | 3220227794ab9b3f96f0038f72165c6f43242fe6 (diff) | |
| download | mariadb-git-54ffc4996a6b9ffd400177864c0b33b49b0c4bcf.tar.gz | |
MDEV-18588 Segfault during SST on joiner with bin-log, no bin-log-index
When node is JOINER and bin-log is enabled but bin-log-index is not set in configuration, we use NULL pointer which causes segfault.
Fixed by checking for NULL pointer before using variable.
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 103afa1c412..d79b7771571 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -337,7 +337,7 @@ static int generate_binlog_index_opt_val(char** ret) { DBUG_ASSERT(ret); *ret= NULL; - if (opt_bin_log) + if (opt_binlog_index_name) { *ret= strcmp(opt_binlog_index_name, "0") ? my_strdup(opt_binlog_index_name, MYF(0)) : my_strdup("", MYF(0)); |