summaryrefslogtreecommitdiff
path: root/wsrep
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-08-21 20:09:05 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2016-08-21 20:09:05 -0400
commit3f481e52e41deecb05874989a51d6b009fda1a23 (patch)
treeb2fe5cdba3c3b602245738c0e2023ede31a87393 /wsrep
parentcced23cf23f013bee9f137001f1d51142bace964 (diff)
downloadmariadb-git-3f481e52e41deecb05874989a51d6b009fda1a23.tar.gz
Fixes for failing tests (post-merge).
Diffstat (limited to 'wsrep')
-rw-r--r--wsrep/wsrep_dummy.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/wsrep/wsrep_dummy.c b/wsrep/wsrep_dummy.c
index 5f1ea63cc40..1780e91f89d 100644
--- a/wsrep/wsrep_dummy.c
+++ b/wsrep/wsrep_dummy.c
@@ -85,8 +85,15 @@ static wsrep_status_t dummy_options_set(
static char* dummy_options_get (wsrep_t* w)
{
- WSREP_DBUG_ENTER(w);
- return strdup(WSREP_DUMMY(w)->options);
+ char *options;
+
+ WSREP_DBUG_ENTER(w);
+ options= WSREP_DUMMY(w)->options;
+
+ if (options)
+ options= strdup(WSREP_DUMMY(w)->options);
+
+ return options;
}
static wsrep_status_t dummy_connect(