From c75e4dfed14e0f96e3458e2a8764ef570bf3b744 Mon Sep 17 00:00:00 2001
From: unknown <jani@rhols221.adsl.netsonic.fi>
Date: Thu, 26 Aug 2004 16:15:36 +0300
Subject: [PATCH] Fixed a bug in mysql.cc. Overriding password prompting by
 giving password as an argument later did not work.

---
 client/mysql.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/mysql.cc b/client/mysql.cc
index dd472041b34..98a6c69d0cd 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -44,7 +44,7 @@
 #include <locale.h>
 #endif
 
-const char *VER= "14.5";
+const char *VER= "14.6";
 
 /* Don't try to make a nice table if the data is too big */
 #define MAX_COLUMN_LENGTH	     1024
@@ -792,6 +792,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
       while (*argument) *argument++= 'x';		// Destroy argument
       if (*start)
 	start[1]=0 ;
+      tty_password= 0;
     }
     else
       tty_password= 1;