summaryrefslogtreecommitdiff
path: root/client/mysqlimport.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/mysqlimport.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/mysqlimport.c')
-rw-r--r--client/mysqlimport.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index e7af106abbb..603e9036106 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -471,9 +471,15 @@ int main(int argc, char **argv)
/* argv is changed in the program */
argv_to_free= argv;
if (get_options(&argc, &argv))
+ {
+ free_defaults(argv_to_free);
return(1);
+ }
if (!(sock= db_connect(current_host,current_db,current_user,opt_password)))
+ {
+ free_defaults(argv_to_free);
return(1); /* purecov: deadcode */
+ }
if (lock_tables)
lock_table(sock, argc, argv);
for (; *argv != NULL; argv++)