summaryrefslogtreecommitdiff
path: root/client/mysqltest.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-02-02 11:38:39 +0100
committerSergei Golubchik <serg@mariadb.org>2018-02-02 11:38:39 +0100
commitbd0eb2bdd7523aa6341645886ef02e28dc31b4b5 (patch)
tree4d5d98ae21b4228622cbdaf90e7bea2caef9ebbf /client/mysqltest.cc
parentd94d937d1c96dae3747a46f35265f8b346951b1c (diff)
downloadmariadb-git-bd0eb2bdd7523aa6341645886ef02e28dc31b4b5.tar.gz
less memory-leak-on-exit reports for clients
mysqltest cannot free all memory on exit by design, so there's no need to check. mysql frees memory in mysql_end(), so enable memory-leak-on-exit check only after it was initialized enough to use mysql_end() - early exits use my_end().
Diffstat (limited to 'client/mysqltest.cc')
-rw-r--r--client/mysqltest.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 2200462b2fe..844a2d7bbf8 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -1523,7 +1523,6 @@ static void cleanup_and_exit(int exit_code)
}
}
- sf_leaking_memory= 0; /* all memory should be freed by now */
exit(exit_code);
}
@@ -7294,10 +7293,7 @@ get_one_option(int optid, const struct my_option *opt, char *argument)
#ifndef EMBEDDED_LIBRARY
if ((opt_protocol= find_type_with_warning(argument, &sql_protocol_typelib,
opt->name)) <= 0)
- {
- sf_leaking_memory= 1; /* no memory leak reports here */
exit(1);
- }
#endif
break;
case '?':