diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-18 15:22:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-18 15:24:04 +0200 |
| commit | d126c40107f9b58efcdb7dabb812b4d6b22f43f0 (patch) | |
| tree | 60720357c53d96e1dcc33ba6e14d7fe2da1c2649 | |
| parent | 68f390e598e71e52a3695dada12d1347892f2028 (diff) | |
| download | mariadb-git-d126c40107f9b58efcdb7dabb812b4d6b22f43f0.tar.gz | |
MDEV-21966: Fix clang -Winconsistent-missing-override
| -rw-r--r-- | sql/sys_vars.ic | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic index 92d8a80c881..0ed72693f15 100644 --- a/sql/sys_vars.ic +++ b/sql/sys_vars.ic @@ -1,5 +1,5 @@ /* Copyright (c) 2002, 2011, Oracle and/or its affiliates. - Copyright (c) 2010, 2019, MariaDB Corporation. + Copyright (c) 2010, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -748,23 +748,23 @@ public: option.var_type|= GET_STR | GET_ASK_ADDR; } - bool do_check(THD *thd, set_var *var) + bool do_check(THD *thd, set_var *var) override { return Sys_var_charptr::do_string_check(thd, var, charset(thd)); } - void session_save_default(THD *thd, set_var *var) + void session_save_default(THD *, set_var *) override { DBUG_ASSERT(FALSE); } - void global_save_default(THD *thd, set_var *var) + void global_save_default(THD *, set_var *) override { DBUG_ASSERT(FALSE); } - bool session_update(THD *thd, set_var *var) + bool session_update(THD *, set_var *) override { DBUG_ASSERT(FALSE); return true; } - bool global_update(THD *thd, set_var *var); + bool global_update(THD *thd, set_var *var) override; bool on_check_access_global(THD *thd) const override { @@ -772,7 +772,7 @@ public: } protected: - uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base); + uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) override; bool set_filter_value(const char *value, Master_info *mi); }; |