diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 14:45:08 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 14:45:08 -0300 |
| commit | c295e3d7b60efcf34da643745a09059ae09d3f8f (patch) | |
| tree | 2c1b96fba8528b2f154fe867bd2ed49704e8d035 /mysys/my_getopt.c | |
| parent | 2fce37d2a9dac30c9f970899fa4239485e953775 (diff) | |
| download | mariadb-git-c295e3d7b60efcf34da643745a09059ae09d3f8f.tar.gz | |
Bug#45288: pb2 returns a lot of compilation warnings on linux
Fix compiler warnings due to: a mismatch in the prototypes for
check_access and implicit conversions from double to ulonglong
and vice-versa.
mysys/my_getopt.c:
Explicit conversion from ulonglong to double. Might need to
be tweaked in the future.
sql/sql_parse.h:
Make prototype equal to the case when not compiling under embedded.
sql/sys_vars.cc:
Explicit conversion from ulonglong to double. Destination var
is a ulonglong.
sql/sys_vars.h:
Explicit conversion from ulonglong to double. Might need to
be tweaked in the future.
Diffstat (limited to 'mysys/my_getopt.c')
| -rw-r--r-- | mysys/my_getopt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 7443405f97c..e4b199dab84 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -1032,7 +1032,7 @@ static void init_one_value(const struct my_option *option, void *variable, *((ulonglong*) variable)= (ulonglong) value; break; case GET_DOUBLE: - *((double*) variable)= (double) value; + *((double*) variable)= ulonglong2double(value); break; case GET_STR: /* |