From d2d52305b45dc02fd8b9520569b18ccc7f5d196b Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Wed, 28 Jun 2017 19:41:08 +0200
Subject: [PATCH] MDEV-12755 Replication tests fail in buildbot with ASAN

remove double-initialization of MYSQL structure
---
 client/mysql.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/mysql.cc b/client/mysql.cc
index f9aba0fd62a..d85b118a2bb 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1145,8 +1145,6 @@ int main(int argc,char *argv[])
   outfile[0]=0;			// no (default) outfile
   strmov(pager, "stdout");	// the default, if --pager wasn't given
 
-  mysql_init(&mysql);
-
   {
     char *tmp=getenv("PAGER");
     if (tmp && strlen(tmp))
@@ -1185,7 +1183,11 @@ int main(int argc,char *argv[])
   }
   defaults_argv=argv;
   if ((status.exit_status= get_options(argc, (char **) argv)))
-    mysql_end(-1);
+  {
+    free_defaults(defaults_argv);
+    my_end(0);
+    exit(status.exit_status);
+  }
 
   if (status.batch && !status.line_buff &&
       !(status.line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, stdin)))