summaryrefslogtreecommitdiff
path: root/sql/rpl_mi.cc
diff options
context:
space:
mode:
authorserg@janus.mylan <>2007-04-16 18:16:17 +0200
committerserg@janus.mylan <>2007-04-16 18:16:17 +0200
commit00479a441ddeeeb334a002fc7883a8777e8caf30 (patch)
tree45078bb08a9d29ab98b50746b333b59e2f1f43af /sql/rpl_mi.cc
parent6bc9bc92df57f1cc586e2223e23c0e94003fa7eb (diff)
downloadmariadb-git-00479a441ddeeeb334a002fc7883a8777e8caf30.tar.gz
wl#2936 post-merge fixes
Diffstat (limited to 'sql/rpl_mi.cc')
-rw-r--r--sql/rpl_mi.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc
index 354a97cefde..bb9d0e6d953 100644
--- a/sql/rpl_mi.cc
+++ b/sql/rpl_mi.cc
@@ -29,8 +29,8 @@ int init_strvar_from_file(char *var, int max_size, IO_CACHE *f,
MASTER_INFO::MASTER_INFO()
:ssl(0), fd(-1), io_thd(0), inited(0),
- abort_slave(0),slave_running(0), slave_run_id(0),
- ssl_verify_server_cert(0)
+ abort_slave(0),slave_running(0),
+ ssl_verify_server_cert(0), slave_run_id(0)
{
host[0] = 0; user[0] = 0; password[0] = 0;
ssl_ca[0]= 0; ssl_capath[0]= 0; ssl_cert[0]= 0;