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 | 26f348c91033178d1c8e758cfffc91d1259386b0 (patch) | |
| tree | c26e086738ee12e6734c31fb1b4e70cf0026caf1 /client/mysqladmin.c | |
| parent | 7efa215e254dc21ec89a30578669d31064d15f9c (diff) | |
| parent | d39ea1fdad104e3262f479653cc4cc9d05f39aea (diff) | |
| download | mariadb-git-26f348c91033178d1c8e758cfffc91d1259386b0.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/mysqladmin.c')
| -rw-r--r-- | client/mysqladmin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqladmin.c b/client/mysqladmin.c index e21db53b470..bccbf29ef83 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -25,7 +25,7 @@ #include <sys/stat.h> #include <mysql.h> -#define ADMIN_VERSION "8.40" +#define ADMIN_VERSION "8.41" #define MAX_MYSQL_VAR 256 #define SHUTDOWN_DEF_TIMEOUT 3600 /* Wait for shutdown */ #define MAX_TRUNC_LENGTH 3 @@ -209,6 +209,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; |