Commit c4a2d3d5 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Portability fixes 

Fixed problem with --password in mysql
parent 24b1874a

client/mysql.cc

+10 −13
Original line number Diff line number Diff line
@@ -664,9 +664,7 @@ 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)

      {

	char *start= argument;
@@ -678,7 +676,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      }

      else

	tty_password= 1;

      }

      break;

    case '#':

      DBUG_PUSH(argument ? argument : default_dbug_option);

mysql-test/r/type_decimal.result

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

mysql-test/t/type_decimal.test

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