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/sql_parse.h | |
| 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/sql_parse.h')
| -rw-r--r-- | sql/sql_parse.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_parse.h b/sql/sql_parse.h index df76df72e09..475811d45b7 100644 --- a/sql/sql_parse.h +++ b/sql/sql_parse.h @@ -183,9 +183,8 @@ inline bool check_merge_table_access(THD *thd, char *db, TABLE_LIST *table_list) inline bool check_some_routine_access(THD *thd, const char *db, const char *name, bool is_proc) { return false; } -inline bool check_access(THD *thd, ulong access, const char *db, - ulong *save_priv, bool no_grant, bool no_errors, - bool schema_db) +inline bool check_access(THD *, ulong, const char *, ulong *save_priv, + GRANT_INTERNAL_INFO *, bool, bool) { if (save_priv) *save_priv= GLOBAL_ACLS; |