fixup 58e759a9: clang -Winconsistent-missing-override

sql/item.cc

@@ -2164,7 +2164,7 @@ class Item_aggregate_ref : public Item_ref
     else
       Item_ident::print(str, query_type);
   }
-  virtual Ref_Type ref_type() { return AGGREGATE_REF; }
+  Ref_Type ref_type() override final { return AGGREGATE_REF; }
 };
 
 

sql/item_sum.h

@@ -1019,7 +1019,7 @@ class Stddev
 class Item_sum_variance :public Item_sum_double
 {
   Stddev m_stddev;
-  bool fix_length_and_dec();
+  bool fix_length_and_dec() override;
 
 public:
   uint sample;
@@ -1030,26 +1030,27 @@ class Item_sum_variance :public Item_sum_double
     sample(sample_arg)
     {}
   Item_sum_variance(THD *thd, Item_sum_variance *item);
-  enum Sumfunctype sum_func () const { return VARIANCE_FUNC; }
+  Sumfunctype sum_func () const override { return VARIANCE_FUNC; }
   void fix_length_and_dec_double();
   void fix_length_and_dec_decimal();
   void clear() override final;
   bool add() override final;
-  double val_real();
+  double val_real() override;
   void reset_field() override final;
   void update_field() override final;
-  Item *result_item(THD *thd, Field *field);
+  Item *result_item(THD *thd, Field *field) override;
   void no_rows_in_result() override final {}
-  const char *func_name() const
+  const char *func_name() const override
     { return sample ? "var_samp(" : "variance("; }
-  Item *copy_or_same(THD* thd);
-  Field *create_tmp_field(MEM_ROOT *root, bool group, TABLE *table);
-  void cleanup()
+  Item *copy_or_same(THD* thd) override;
+  Field *create_tmp_field(MEM_ROOT *root, bool group, TABLE *table) override
+    final;
+  void cleanup() override final
   {
     m_stddev= Stddev();
     Item_sum_double::cleanup();
   }
-  Item *get_copy(THD *thd)
+  Item *get_copy(THD *thd) override
   { return get_item_copy<Item_sum_variance>(thd, this); }
 };
 
@@ -1065,12 +1066,12 @@ class Item_sum_std final :public Item_sum_variance
   Item_sum_std(THD *thd, Item_sum_std *item)
     :Item_sum_variance(thd, item)
     {}
-  enum Sumfunctype sum_func () const { return STD_FUNC; }
-  double val_real();
-  Item *result_item(THD *thd, Field *field);
-  const char *func_name() const { return "std("; }
-  Item *copy_or_same(THD* thd);
-  Item *get_copy(THD *thd)
+  enum Sumfunctype sum_func () const override final { return STD_FUNC; }
+  double val_real() override final;
+  Item *result_item(THD *thd, Field *field) override final;
+  const char *func_name() const override final { return "std("; }
+  Item *copy_or_same(THD* thd) override final;
+  Item *get_copy(THD *thd) override final
   { return get_item_copy<Item_sum_std>(thd, this); }
 };
 

sql/protocol.h

@@ -2,6 +2,7 @@
 #define PROTOCOL_INCLUDED
 
 /* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 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
@@ -214,27 +215,27 @@ class Protocol_text final :public Protocol
     if (prealloc)
       packet->alloc(prealloc);
   }
-  virtual void prepare_for_resend();
-  virtual bool store_null();
-  virtual bool store_tiny(longlong from);
-  virtual bool store_short(longlong from);
-  virtual bool store_long(longlong from);
-  virtual bool store_longlong(longlong from, bool unsigned_flag);
-  virtual bool store_decimal(const my_decimal *);
-  virtual bool store_str(const char *from, size_t length,
+  void prepare_for_resend() override;
+  bool store_null() override;
+  bool store_tiny(longlong from) override;
+  bool store_short(longlong from) override;
+  bool store_long(longlong from) override;
+  bool store_longlong(longlong from, bool unsigned_flag) override;
+  bool store_decimal(const my_decimal *) override;
+  bool store_str(const char *from, size_t length,
                  CHARSET_INFO *fromcs,
                  my_repertoire_t from_repertoire,
-                         CHARSET_INFO *tocs);
-  virtual bool store(MYSQL_TIME *time, int decimals);
-  virtual bool store_date(MYSQL_TIME *time);
-  virtual bool store_time(MYSQL_TIME *time, int decimals);
-  virtual bool store(float nr, uint32 decimals, String *buffer);
-  virtual bool store(double from, uint32 decimals, String *buffer);
-  virtual bool store(Field *field);
-
-  virtual bool send_out_parameters(List<Item_param> *sp_params);
+                 CHARSET_INFO *tocs) override;
+  bool store(MYSQL_TIME *time, int decimals) override;
+  bool store_date(MYSQL_TIME *time) override;
+  bool store_time(MYSQL_TIME *time, int decimals) override;
+  bool store(float nr, uint32 decimals, String *buffer) override;
+  bool store(double from, uint32 decimals, String *buffer) override;
+  bool store(Field *field) override;
+
+  bool send_out_parameters(List<Item_param> *sp_params) override;
 #ifdef EMBEDDED_LIBRARY
-  void remove_last_row();
+  void remove_last_row() override;
 #endif
   bool store_field_metadata(const THD *thd, const Send_field &field,
                             CHARSET_INFO *charset_for_protocol,
@@ -253,32 +254,32 @@ class Protocol_binary final :public Protocol
   uint bit_fields;
 public:
   Protocol_binary(THD *thd_arg) :Protocol(thd_arg) {}
-  virtual bool prepare_for_send(uint num_columns);
-  virtual void prepare_for_resend();
+  bool prepare_for_send(uint num_columns) override;
+  void prepare_for_resend() override;
 #ifdef EMBEDDED_LIBRARY
-  virtual bool write();
-  bool net_store_data(const uchar *from, size_t length);
+  bool write() override;
+  bool net_store_data(const uchar *from, size_t length) override;
   bool net_store_data_cs(const uchar *from, size_t length,
-                      CHARSET_INFO *fromcs, CHARSET_INFO *tocs);
+                         CHARSET_INFO *fromcs, CHARSET_INFO *tocs) override;
 #endif
-  virtual bool store_null();
-  virtual bool store_tiny(longlong from);
-  virtual bool store_short(longlong from);
-  virtual bool store_long(longlong from);
-  virtual bool store_longlong(longlong from, bool unsigned_flag);
-  virtual bool store_decimal(const my_decimal *);
-  virtual bool store_str(const char *from, size_t length,
+  bool store_null() override;
+  bool store_tiny(longlong from) override;
+  bool store_short(longlong from) override;
+  bool store_long(longlong from) override;
+  bool store_longlong(longlong from, bool unsigned_flag) override;
+  bool store_decimal(const my_decimal *) override;
+  bool store_str(const char *from, size_t length,
                  CHARSET_INFO *fromcs,
                  my_repertoire_t from_repertoire,
-                         CHARSET_INFO *tocs);
-  virtual bool store(MYSQL_TIME *time, int decimals);
-  virtual bool store_date(MYSQL_TIME *time);
-  virtual bool store_time(MYSQL_TIME *time, int decimals);
-  virtual bool store(float nr, uint32 decimals, String *buffer);
-  virtual bool store(double from, uint32 decimals, String *buffer);
-  virtual bool store(Field *field);
-
-  virtual bool send_out_parameters(List<Item_param> *sp_params);
+                 CHARSET_INFO *tocs) override;
+  bool store(MYSQL_TIME *time, int decimals) override;
+  bool store_date(MYSQL_TIME *time) override;
+  bool store_time(MYSQL_TIME *time, int decimals) override;
+  bool store(float nr, uint32 decimals, String *buffer) override;
+  bool store(double from, uint32 decimals, String *buffer) override;
+  bool store(Field *field) override;
+
+  bool send_out_parameters(List<Item_param> *sp_params) override;
 
   enum enum_protocol_type type() override { return PROTOCOL_BINARY; };
 };

storage/maria/ha_maria.h

@@ -65,7 +65,7 @@ class __attribute__((visibility("default"))) ha_maria :public handler
 public:
   ha_maria(handlerton *hton, TABLE_SHARE * table_arg);
   ~ha_maria() {}
-  handler *clone(const char *name, MEM_ROOT *mem_root);
+  handler *clone(const char *name, MEM_ROOT *mem_root) override final;
   const char *index_type(uint key_number) override final;
   ulonglong table_flags() const override final
   { return int_table_flags; }