Commit 773a256e authored by unknown's avatar unknown
Browse files

[This patch has already been approved by Serge. I am recommitting and pushing... 

[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
parent 419ca715

client/mysql.cc

+1 −0
Original line number Diff line number Diff line
@@ -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;