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

Portability fixes

Fixed problem with --password in mysql
parent 24b1874a
...@@ -664,21 +664,18 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -664,21 +664,18 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
break; break;
case 'p': case 'p':
if (argument == disabled_my_option) if (argument == disabled_my_option)
opt_password= (char*) ""; argument= (char*) ""; // Don't require password
else if (argument)
{ {
if (argument) char *start= argument;
{ my_free(opt_password, MYF(MY_ALLOW_ZERO_PTR));
char *start= argument; opt_password= my_strdup(argument, MYF(MY_FAE));
my_free(opt_password, MYF(MY_ALLOW_ZERO_PTR)); while (*argument) *argument++= 'x'; // Destroy argument
opt_password= my_strdup(argument, MYF(MY_FAE)); if (*start)
while (*argument) *argument++= 'x'; // Destroy argument start[1]=0 ;
if (*start)
start[1]=0 ;
}
else
tty_password= 1;
} }
else
tty_password= 1;
break; break;
case '#': case '#':
DBUG_PUSH(argument ? argument : default_dbug_option); DBUG_PUSH(argument ? argument : default_dbug_option);
......
...@@ -232,7 +232,7 @@ a ...@@ -232,7 +232,7 @@ a
99999999.99 99999999.99
drop table t1; drop table t1;
create table t1 (a decimal(10,2)); 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 (-.1),(+.1),(.1);
insert into t1 values (00000000000001),(+0000000000001),(-0000000000001); insert into t1 values (00000000000001),(+0000000000001),(-0000000000001);
insert into t1 values (+111111111.11),(111111111.11),(-11111111.11); insert into t1 values (+111111111.11),(111111111.11),(-11111111.11);
......
...@@ -183,7 +183,8 @@ drop table t1; ...@@ -183,7 +183,8 @@ drop table t1;
create table t1 (a decimal(10,2)); 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 (-.1),(+.1),(.1);
insert into t1 values (00000000000001),(+0000000000001),(-0000000000001); insert into t1 values (00000000000001),(+0000000000001),(-0000000000001);
insert into t1 values (+111111111.11),(111111111.11),(-11111111.11); insert into t1 values (+111111111.11),(111111111.11),(-11111111.11);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment