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 /sql/sys_vars.cc | |
| 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 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 53b07371baa..6e95961ebb0 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -942,10 +942,10 @@ static bool update_cached_long_query_time(sys_var *self, THD *thd, { if (type == OPT_SESSION) thd->variables.long_query_time= - thd->variables.long_query_time_double * 1e6; + double2ulonglong(thd->variables.long_query_time_double * 1e6); else global_system_variables.long_query_time= - global_system_variables.long_query_time_double * 1e6; + double2ulonglong(global_system_variables.long_query_time_double * 1e6); return false; } |