diff options
| author | unknown <jani@a80-186-41-201.elisa-laajakaista.fi> | 2004-10-07 22:09:14 +0300 |
|---|---|---|
| committer | unknown <jani@a80-186-41-201.elisa-laajakaista.fi> | 2004-10-07 22:09:14 +0300 |
| commit | 5785be0345322decd6086c0e8b97985d360b0a27 (patch) | |
| tree | c26e086738ee12e6734c31fb1b4e70cf0026caf1 /client/mysqlimport.c | |
| parent | 7d5716bad245fc8b6be34fbf3138bba4167fb172 (diff) | |
| parent | 6381c36046ed6661496e08858f7e12bfd759ea2a (diff) | |
| download | mariadb-git-5785be0345322decd6086c0e8b97985d360b0a27.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into a80-186-41-201.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
client/mysqladmin.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
Diffstat (limited to 'client/mysqlimport.c')
| -rw-r--r-- | client/mysqlimport.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index aaf04b1bc3e..447410fa947 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -25,7 +25,7 @@ ** * * ** ************************* */ -#define IMPORT_VERSION "3.4" +#define IMPORT_VERSION "3.5" #include "client_priv.h" #include "mysql_version.h" @@ -191,6 +191,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), while (*argument) *argument++= 'x'; /* Destroy argument */ if (*start) start[1]=0; /* Cut length of argument */ + tty_password= 0; } else tty_password= 1; |