diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-07 21:53:00 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-07 21:53:00 -0300 |
| commit | 754471060b2dfdfd4929f1b04560e3fd66755763 (patch) | |
| tree | d5c8418a06d85be40ca7ede3cdcaf10e785a0700 /sql/sys_vars.h | |
| parent | 28be8f919f768542465b07099f711632e3334f6e (diff) | |
| download | mariadb-git-754471060b2dfdfd4929f1b04560e3fd66755763.tar.gz | |
Bug#45288: pb2 returns a lot of compilation warnings on linux
Fix warnings related to the use of the deprecated gets() function
and passing NULL to non-pointer argument of the sys_var constructor.
plugin/auth/dialog.c:
Do not use the deprecated gets() function.
sql/sys_vars.h:
Do not pass NULL to a non-pointer argument of the sys_var constructor.
Diffstat (limited to 'sql/sys_vars.h')
| -rw-r--r-- | sql/sys_vars.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/sys_vars.h b/sql/sys_vars.h index 89e2bdfdf60..e16bd3c5330 100644 --- a/sql/sys_vars.h +++ b/sql/sys_vars.h @@ -458,12 +458,10 @@ class Sys_var_proxy_user: public sys_var public: Sys_var_proxy_user(const char *name_arg, const char *comment, enum charset_enum is_os_charset_arg) - : sys_var(&all_sys_vars, name_arg, comment, + : sys_var(&all_sys_vars, name_arg, comment, sys_var::READONLY+sys_var::ONLY_SESSION, 0, -1, - NO_ARG, SHOW_CHAR, (intptr)NULL, - 0, VARIABLE_NOT_IN_BINLOG, - 0, 0, - 0, 0, PARSE_NORMAL) + NO_ARG, SHOW_CHAR, 0, NULL, VARIABLE_NOT_IN_BINLOG, + NULL, NULL, 0, NULL, PARSE_NORMAL) { is_os_charset= is_os_charset_arg == IN_FS_CHARSET; option.var_type= GET_STR; |