Merge mariadb-10.5.5

1 files changed, 72 insertions, 69 deletions

diff --git a/sql/protocol.h b/sql/protocol.h
index 574e7efed05..45f6d66dc26 100644
--- a/sql/protocol.h
+++ b/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
@@ -190,7 +191,8 @@ public:
       Before adding a new type, please make sure
       there is enough storage for it in Query_cache_query_flags.
     */
-    PROTOCOL_TEXT= 0, PROTOCOL_BINARY= 1, PROTOCOL_LOCAL= 2
+    PROTOCOL_TEXT= 0, PROTOCOL_BINARY= 1, PROTOCOL_LOCAL= 2,
+    PROTOCOL_DISCARD= 3 /* Should be last, not used by Query_cache */
   };
   virtual enum enum_protocol_type type()= 0;
 
@@ -204,7 +206,7 @@ public:
 
 /** Class used for the old (MySQL 4.0 protocol). */
 
-class Protocol_text :public Protocol
+class Protocol_text final :public Protocol
 {
   bool store_numeric_string_aux(const char *from, size_t length);
 public:
@@ -214,27 +216,27 @@ public:
     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,
-                         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);
+  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) 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,
@@ -243,44 +245,44 @@ public:
   bool store_field_metadata_for_list_fields(const THD *thd, Field *field,
                                             const TABLE_LIST *table_list,
                                             uint pos);
-  virtual enum enum_protocol_type type() { return PROTOCOL_TEXT; };
+  enum enum_protocol_type type() override { return PROTOCOL_TEXT; };
 };
 
 
-class Protocol_binary :public Protocol
+class Protocol_binary final :public Protocol
 {
 private:
   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,
-                         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);
-
-  virtual enum enum_protocol_type type() { return PROTOCOL_BINARY; };
+  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) 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; };
 };
 
 
@@ -298,37 +300,38 @@ public:
   select_send::send_data() & co., and also uses  Protocol_discard object.
 */
 
-class Protocol_discard : public Protocol_text
+class Protocol_discard final : public Protocol
 {
 public:
-  Protocol_discard(THD *thd_arg) : Protocol_text(thd_arg) {}
-  bool write() { return 0; }
-  bool send_result_set_metadata(List<Item> *, uint) { return 0; }
-  bool send_eof(uint, uint) { return 0; }
-  void prepare_for_resend() { IF_DBUG(field_pos= 0,); }
+  Protocol_discard(THD *thd_arg) : Protocol(thd_arg) {}
+  bool write() override { return 0; }
+  bool send_result_set_metadata(List<Item> *, uint) override { return 0; }
+  bool send_eof(uint, uint) override { return 0; }
+  void prepare_for_resend() override { IF_DBUG(field_pos= 0,); }
+  bool send_out_parameters(List<Item_param> *sp_params) override { return false; }
   
   /* 
     Provide dummy overrides for any storage methods so that we
     avoid allocating and copying of data
   */
-  bool store_null() { return false; }
-  bool store_tiny(longlong) { return false; }
-  bool store_short(longlong) { return false; }
-  bool store_long(longlong) { return false; }
-  bool store_longlong(longlong, bool) { return false; }
-  bool store_decimal(const my_decimal *) { return false; }
+  bool store_null() override { return false; }
+  bool store_tiny(longlong) override { return false; }
+  bool store_short(longlong) override { return false; }
+  bool store_long(longlong) override { return false; }
+  bool store_longlong(longlong, bool) override { return false; }
+  bool store_decimal(const my_decimal *) override { return false; }
   bool store_str(const char *, size_t, CHARSET_INFO *, my_repertoire_t,
-                 CHARSET_INFO *)
+                 CHARSET_INFO *) override
   {
     return false;
   }
-  bool store(MYSQL_TIME *, int) { return false; }
-  bool store_date(MYSQL_TIME *) { return false; }
-  bool store_time(MYSQL_TIME *, int) { return false; }
-  bool store(float, uint32, String *) { return false; }
-  bool store(double, uint32, String *) { return false; }
-  bool store(Field *) { return false; }
-
+  bool store(MYSQL_TIME *, int) override { return false; }
+  bool store_date(MYSQL_TIME *) override { return false; }
+  bool store_time(MYSQL_TIME *, int) override { return false; }
+  bool store(float, uint32, String *) override { return false; }
+  bool store(double, uint32, String *) override { return false; }
+  bool store(Field *) override { return false; }
+  enum enum_protocol_type type() override { return PROTOCOL_DISCARD; };
 };