summaryrefslogtreecommitdiff
path: root/client/mysqladmin.c
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-08-24 02:08:10 +0300
committerunknown <monty@mashka.mysql.fi>2002-08-24 02:08:10 +0300
commitc216222b5a13aae392abc35849a6887a6aa48b1d (patch)
treeb6f240b448658aa070696e59191554c4475198e0 /client/mysqladmin.c
parenta0c16f907ecce4a0489fd7cd7189144259de8c43 (diff)
downloadmariadb-git-c216222b5a13aae392abc35849a6887a6aa48b1d.tar.gz
Removed wrong mutex lock (hangup in kill on HPUX)
all free_defaults() on exit in mysql.cc; Should fix problem with SSL Docs/manual.texi: Added information about --skip-innodb client/mysql.cc: Call free_defaults() on exit client/mysqladmin.c: Call free_defaults() on exit client/mysqlimport.c: Call free_defaults() on exit mysql-test/r/rpl000016.result: Added testing of temporary tables with binary log rotation mysql-test/t/rpl000016.test: Added testing of temporary tables with binary log rotation sql/log.cc: Remove not used variable sql/sql_class.h: Removed wrong mutex lock (hangup in kill on HPUX)
Diffstat (limited to 'client/mysqladmin.c')
-rw-r--r--client/mysqladmin.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/client/mysqladmin.c b/client/mysqladmin.c
index 4da995fa224..cdca59574f7 100644
--- a/client/mysqladmin.c
+++ b/client/mysqladmin.c
@@ -254,7 +254,10 @@ int main(int argc,char *argv[])
load_defaults("my",load_default_groups,&argc,&argv);
save_argv = argv; /* Save for free_defaults */
if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
+ {
+ free_defaults(save_argv);
exit(ho_error);
+ }
if (argc == 0)
{