diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-26 14:13:12 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-26 14:13:12 -0400 |
| commit | c5f7486654d7fd4941b202735799f9a7ec3c15eb (patch) | |
| tree | 69bd9f5b0cf31b853539ebecac98c32a5e637dd9 /sql/slave.cc | |
| parent | b5871a51e99f2d591e944590f2e2332275064d07 (diff) | |
| download | mariadb-git-c5f7486654d7fd4941b202735799f9a7ec3c15eb.tar.gz | |
bzr merge -r4062..4065 codership/5.6
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 0dcaec838da..7fa00b7425a 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4628,6 +4628,7 @@ err_during_init: } } #endif /* WITH_WSREP */ + DBUG_LEAVE; // Must match DBUG_ENTER() my_thread_end(); #ifdef HAVE_OPENSSL |