Commit 0efe50ec authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Remove the most annoying clang-cl warnings

Fix "consistent override", and "unused private field" warnings
in popular header files.
parent 0179aad6
...@@ -84,7 +84,6 @@ class Conv_param ...@@ -84,7 +84,6 @@ class Conv_param
class Conv_source: public Type_handler_hybrid_field_type class Conv_source: public Type_handler_hybrid_field_type
{ {
enum_field_types m_type;
uint16 m_metadata; uint16 m_metadata;
CHARSET_INFO *m_cs; CHARSET_INFO *m_cs;
public: public:
......
...@@ -2792,7 +2792,6 @@ class Regexp_processor_pcre ...@@ -2792,7 +2792,6 @@ class Regexp_processor_pcre
bool m_conversion_is_needed; bool m_conversion_is_needed;
bool m_is_const; bool m_is_const;
int m_library_flags; int m_library_flags;
CHARSET_INFO *m_data_charset;
CHARSET_INFO *m_library_charset; CHARSET_INFO *m_library_charset;
String m_prev_pattern; String m_prev_pattern;
int m_pcre_exec_rc; int m_pcre_exec_rc;
...@@ -2809,7 +2808,6 @@ class Regexp_processor_pcre ...@@ -2809,7 +2808,6 @@ class Regexp_processor_pcre
Regexp_processor_pcre() : Regexp_processor_pcre() :
m_pcre(NULL), m_conversion_is_needed(true), m_is_const(0), m_pcre(NULL), m_conversion_is_needed(true), m_is_const(0),
m_library_flags(0), m_library_flags(0),
m_data_charset(&my_charset_utf8mb3_general_ci),
m_library_charset(&my_charset_utf8mb3_general_ci) m_library_charset(&my_charset_utf8mb3_general_ci)
{ {
m_pcre_extra.flags= PCRE_EXTRA_MATCH_LIMIT_RECURSION; m_pcre_extra.flags= PCRE_EXTRA_MATCH_LIMIT_RECURSION;
......
...@@ -127,9 +127,9 @@ class Item_func_json_value: public Item_str_func, ...@@ -127,9 +127,9 @@ class Item_func_json_value: public Item_str_func,
public: public:
Item_func_json_value(THD *thd, Item *js, Item *i_path): Item_func_json_value(THD *thd, Item *js, Item *i_path):
Item_str_func(thd, js, i_path) {} Item_str_func(thd, js, i_path) {}
const char *func_name() const { return "json_value"; } const char *func_name() const override { return "json_value"; }
bool fix_length_and_dec(); bool fix_length_and_dec() override ;
String *val_str(String *to) String *val_str(String *to) override
{ {
null_value= Json_path_extractor::extract(to, args[0], args[1], null_value= Json_path_extractor::extract(to, args[0], args[1],
collation.collation); collation.collation);
...@@ -140,7 +140,7 @@ class Item_func_json_value: public Item_str_func, ...@@ -140,7 +140,7 @@ class Item_func_json_value: public Item_str_func,
{ {
return je->check_and_get_value_scalar(res, error); return je->check_and_get_value_scalar(res, error);
} }
Item *get_copy(THD *thd) Item *get_copy(THD *thd) override
{ return get_item_copy<Item_func_json_value>(thd, this); } { return get_item_copy<Item_func_json_value>(thd, this); }
}; };
...@@ -151,9 +151,9 @@ class Item_func_json_query: public Item_json_func, ...@@ -151,9 +151,9 @@ class Item_func_json_query: public Item_json_func,
public: public:
Item_func_json_query(THD *thd, Item *js, Item *i_path): Item_func_json_query(THD *thd, Item *js, Item *i_path):
Item_json_func(thd, js, i_path) {} Item_json_func(thd, js, i_path) {}
const char *func_name() const { return "json_query"; } const char *func_name() const override { return "json_query"; }
bool fix_length_and_dec(); bool fix_length_and_dec() override;
String *val_str(String *to) String *val_str(String *to) override
{ {
null_value= Json_path_extractor::extract(to, args[0], args[1], null_value= Json_path_extractor::extract(to, args[0], args[1],
collation.collation); collation.collation);
...@@ -164,7 +164,7 @@ class Item_func_json_query: public Item_json_func, ...@@ -164,7 +164,7 @@ class Item_func_json_query: public Item_json_func,
{ {
return je->check_and_get_value_complex(res, error); return je->check_and_get_value_complex(res, error);
} }
Item *get_copy(THD *thd) Item *get_copy(THD *thd) override
{ return get_item_copy<Item_func_json_query>(thd, this); } { return get_item_copy<Item_func_json_query>(thd, this); }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment