diff options
author | Monty <monty@mariadb.org> | 2020-08-19 02:53:22 +0300 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2021-05-19 22:27:53 +0200 |
commit | 30f0a246a0a2051a5228ecc1c365129ff9920396 (patch) | |
tree | b8cf06048af27a6383ac5f70b860d68156fac5a9 /sql/item_xmlfunc.h | |
parent | 53b43f30781fb26bf8a9764e4d852ac581edd964 (diff) | |
download | mariadb-git-30f0a246a0a2051a5228ecc1c365129ff9920396.tar.gz |
Added override to all releveant methods in Item (and a few other classes)
Other things:
- Remove inline and virtual for methods that are overrides
- Added a 'final' to some Item classes
Diffstat (limited to 'sql/item_xmlfunc.h')
-rw-r--r-- | sql/item_xmlfunc.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/item_xmlfunc.h b/sql/item_xmlfunc.h index 366958710a4..e2ffe2fa630 100644 --- a/sql/item_xmlfunc.h +++ b/sql/item_xmlfunc.h @@ -117,9 +117,9 @@ public: { set_maybe_null(); } - bool fix_fields(THD *thd, Item **ref); - bool fix_length_and_dec(); - bool const_item() const + bool fix_fields(THD *thd, Item **ref) override; + bool fix_length_and_dec() override; + bool const_item() const override { return const_item_cache && (!nodeset_func || nodeset_func->const_item()); } @@ -136,8 +136,8 @@ public: static LEX_CSTRING name= {STRING_WITH_LEN("extractvalue") }; return name; } - String *val_str(String *); - Item *get_copy(THD *thd) + String *val_str(String *) override; + Item *get_copy(THD *thd) override { return get_item_copy<Item_func_xml_extractvalue>(thd, this); } }; @@ -157,8 +157,8 @@ public: static LEX_CSTRING name= {STRING_WITH_LEN("updatexml") }; return name; } - String *val_str(String *); - Item *get_copy(THD *thd) + String *val_str(String *) override; + Item *get_copy(THD *thd) override { return get_item_copy<Item_func_xml_update>(thd, this); } }; |