From 773a256e89cccd426ed7b9d2a077eeb4c6736355 Mon Sep 17 00:00:00 2001
From: unknown <rburnett@build.mysql.com>
Date: Wed, 8 Sep 2004 16:31:01 +0200
Subject: [PATCH] [This patch has already been approved by Serge.  I am
 recommitting and pushing from a new repository because there were other
 changesets that couldn't be pushed.]

BUG# 5229 --password=foobar does not override the empty 'password' option in the my.cnf
This is a backport of a change made by jani in the 4.1 tree.

mysql.cc:
  Add tty_password=0 in the p case handling in get_one_option


client/mysql.cc:
  Add tty_password=0 in the p case handling in get_one_option
---
 client/mysql.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/mysql.cc b/client/mysql.cc
index 3cc8b41af66..7d1b6af2c37 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -689,6 +689,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;