summaryrefslogtreecommitdiff
path: root/client/mysqlimport.c
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-04-11 20:44:52 -0700
committerIgor Babaev <igor@askmonty.org>2012-04-11 20:44:52 -0700
commit9e74665a2d91e299d1b9c5c2695855426aad78eb (patch)
tree9c865c2e18fcb814ef80e96965debf53a0923e6a /client/mysqlimport.c
parent1c0a89afcc1581187e8ee84abbd445da2bfa45d9 (diff)
parent85a025f30c5196c22c5b1d7960912fe9b3f0d6c0 (diff)
downloadmariadb-git-9e74665a2d91e299d1b9c5c2695855426aad78eb.tar.gz
Merge 5.5 -> 5.5-mwl248.
Diffstat (limited to 'client/mysqlimport.c')
-rw-r--r--client/mysqlimport.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index e721b841f06..e4e34f786d7 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -613,6 +613,7 @@ int main(int argc, char **argv)
{
int error=0;
MY_INIT(argv[0]);
+ sf_leaking_memory=1; /* don't report memory leaks on early exits */
if (load_defaults("my",load_default_groups,&argc,&argv))
return 1;
@@ -623,6 +624,7 @@ int main(int argc, char **argv)
free_defaults(argv_to_free);
return(1);
}
+ sf_leaking_memory=0; /* from now on we cleanup properly */
#ifdef HAVE_LIBPTHREAD
if (opt_use_threads && !lock_tables)