diff --git a/client/mysql.cc b/client/mysql.cc
index 6cde23a2a2f..1a0b4dffb05 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -664,21 +664,18 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
       break;
     case 'p':
       if (argument == disabled_my_option)
-	opt_password= (char*) "";
-      else
+	argument= (char*) "";			// Don't require password
+      if (argument)
       {
-	if (argument)
-	{
-	  char *start= argument;
-	  my_free(opt_password, MYF(MY_ALLOW_ZERO_PTR));
-	  opt_password= my_strdup(argument, MYF(MY_FAE));
-	  while (*argument) *argument++= 'x';		// Destroy argument
-	  if (*start)
-	    start[1]=0 ;
-	}
-	else
-	  tty_password= 1;
+	char *start= argument;
+	my_free(opt_password, MYF(MY_ALLOW_ZERO_PTR));
+	opt_password= my_strdup(argument, MYF(MY_FAE));
+	while (*argument) *argument++= 'x';		// Destroy argument
+	if (*start)
+	  start[1]=0 ;
       }
+      else
+	tty_password= 1;
       break;
     case '#':
       DBUG_PUSH(argument ? argument : default_dbug_option);
diff --git a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result
index 94fa112b57b..f4dfc3c2891 100644
--- a/mysql-test/r/type_decimal.result
+++ b/mysql-test/r/type_decimal.result
@@ -232,7 +232,7 @@ a
 99999999.99
 drop  table t1;
 create table t1 (a decimal(10,2));
-insert into t1 values (0.0),(-0.0),(+0.0),(01.0),(+01.0),(-01.0);
+insert into t1 values (0.0),("-0.0"),(+0.0),(01.0),(+01.0),(-01.0);
 insert into t1 values (-.1),(+.1),(.1);
 insert into t1 values (00000000000001),(+0000000000001),(-0000000000001);
 insert into t1 values (+111111111.11),(111111111.11),(-11111111.11);
diff --git a/mysql-test/t/type_decimal.test b/mysql-test/t/type_decimal.test
index 70b30d455da..376aa0c7052 100644
--- a/mysql-test/t/type_decimal.test
+++ b/mysql-test/t/type_decimal.test
@@ -183,7 +183,8 @@ drop  table t1;
 
 
 create table t1 (a decimal(10,2));
-insert into t1 values (0.0),(-0.0),(+0.0),(01.0),(+01.0),(-01.0);
+# The -0.0 needs to be typed as not all platforms supports this
+insert into t1 values (0.0),("-0.0"),(+0.0),(01.0),(+01.0),(-01.0);
 insert into t1 values (-.1),(+.1),(.1);
 insert into t1 values (00000000000001),(+0000000000001),(-0000000000001);
 insert into t1 values (+111111111.11),(111111111.11),(-11111111.11);