database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

MDEV-12755 Replication tests fail in buildbot with ASAN

Browse Source 
remove double-initialization of MYSQL structure
This commit is contained in:
Sergei Golubchik
2017-06-28 19:41:08 +02:00
parent cf9c290563
commit d2d52305b4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/mysql.cc
View File

@@ -1145,8 +1145,6 @@ int main(int argc,char *argv[])
outfile[0]=0; // no (default) outfile outfile[0]=0; // no (default) outfile
strmov(pager, "stdout"); // the default, if --pager wasn't given strmov(pager, "stdout"); // the default, if --pager wasn't given
mysql_init(&mysql);
{ {
char *tmp=getenv("PAGER"); char *tmp=getenv("PAGER");
if (tmp && strlen(tmp)) if (tmp && strlen(tmp))
@@ -1185,7 +1183,11 @@ int main(int argc,char *argv[])
} }
defaults_argv=argv; defaults_argv=argv;
if ((status.exit_status= get_options(argc, (char **) 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 && if (status.batch && !status.line_buff &&
!(status.line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, stdin))) !(status.line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, stdin)))