diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | client/mysqladmin.c | 3 | ||||
| -rw-r--r-- | client/mysqlcheck.c | 3 | ||||
| -rw-r--r-- | client/mysqldump.c | 3 | ||||
| -rw-r--r-- | client/mysqlimport.c | 3 | ||||
| -rw-r--r-- | client/mysqlshow.c | 3 | ||||
| -rw-r--r-- | client/mysqltest.c | 3 |
7 files changed, 13 insertions, 6 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index e3aefbf3efc..5553d70e932 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -66,6 +66,7 @@ igor@rurik.mysql.com ingo@mysql.com jan@hundin.mysql.fi jani@a80-186-24-72.elisa-laajakaista.fi +jani@a80-186-41-201.elisa-laajakaista.fi jani@dsl-jkl1657.dial.inet.fi jani@dsl-kpogw4gb5.dial.inet.fi jani@hynda.(none) diff --git a/client/mysqladmin.c b/client/mysqladmin.c index df3e8dfed62..4a823b9e718 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; diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index bcfceb74f14..8182b95fb83 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -16,7 +16,7 @@ /* By Jani Tolonen, 2001-04-20, MySQL Development Team */ -#define CHECK_VERSION "2.4.3" +#define CHECK_VERSION "2.4.4" #include "client_priv.h" #include <m_ctype.h> @@ -246,6 +246,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; diff --git a/client/mysqldump.c b/client/mysqldump.c index 65f7fe87c8e..56505afd235 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -37,7 +37,7 @@ ** 10 Jun 2003: SET NAMES and --no-set-names by Alexander Barkov */ -#define DUMP_VERSION "10.7" +#define DUMP_VERSION "10.8" #include <my_global.h> #include <my_sys.h> @@ -486,6 +486,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; diff --git a/client/mysqlimport.c b/client/mysqlimport.c index c68d2d9f724..af6932620bb 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; diff --git a/client/mysqlshow.c b/client/mysqlshow.c index 9c9fdf6e443..ee478058cdc 100644 --- a/client/mysqlshow.c +++ b/client/mysqlshow.c @@ -16,7 +16,7 @@ /* Show databases, tables or columns */ -#define SHOW_VERSION "9.4" +#define SHOW_VERSION "9.5" #include "client_priv.h" #include <my_sys.h> @@ -257,6 +257,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; diff --git a/client/mysqltest.c b/client/mysqltest.c index 7f2b6e16947..d2d110c7954 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -42,7 +42,7 @@ **********************************************************************/ -#define MTEST_VERSION "2.1" +#define MTEST_VERSION "2.2" #include <my_global.h> #include <mysql_embed.h> @@ -2090,6 +2090,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), my_free(pass, MYF(MY_ALLOW_ZERO_PTR)); pass= my_strdup(argument, MYF(MY_FAE)); while (*argument) *argument++= 'x'; /* Destroy argument */ + tty_password= 0; } else tty_password= 1; |