Bug #26030132: REMOVE SQL_ALLOC

Finally remove Sql_alloc, now that 8.0 has been branched off. This is a no-op
change for all existing code; there is no code that does new Foo() inheriting
from Sql_alloc, since that overload doesn't exist, and similarly no code that
deletes such objects, since operator delete is private.

After this, it is possible to write such code, and it will do the obvious thing
(allocate on the regular heap, and destroy similarly). As usual, code that wants
to allocate on a MEM_ROOT must say so explicitly by use of overloaded new.

Change-Id: I2e98b39daa06d6dfd8b8c5b1d45a85b1ddc02b3b

Author: Steinar H. Gunderson

sql/abstract_query_plan.h

@@ -22,7 +22,6 @@
 
 #include "my_dbug.h"
 #include "sql/item_cmpfunc.h" // Item_equal_iterator
-#include "sql/sql_alloc.h"
 
 class Item;
 class Item_field;
@@ -65,7 +64,7 @@ namespace AQP
     sequence of n table access operations that will execute as a nested loop 
     join.
   */
-  class Join_plan : public Sql_alloc
+  class Join_plan
   {
     friend class Equal_set_iterator;
     friend class Table_access;
@@ -105,7 +104,7 @@ namespace AQP
     SELECT * FROM T1, T2, T3 WHERE T1.b = T2.a AND T2.a = T3.a
     then there would be such a set of {T1.b, T2.a, T3.a}.
   */
-  class Equal_set_iterator : public Sql_alloc
+  class Equal_set_iterator
   {
   public:
     explicit Equal_set_iterator(Item_equal& item_equal)
@@ -173,7 +172,7 @@ namespace AQP
     owned by a Join_plan object, such that the life time of the Table_access 
     object ends when the life time of the owning Join_plan object ends.
    */
-  class Table_access : public Sql_alloc
+  class Table_access
   {
     friend class Join_plan;
     friend inline bool equal(const Table_access*, const Table_access*);

sql/aggregate_check.h

@@ -457,7 +457,6 @@ VE2 are NULL then VE3 must be NULL, which makes the dependency NULL-friendly.
 #include "sql/item_cmpfunc.h"    // Item_func_any_value
 #include "sql/item_sum.h"        // Item_sum
 #include "sql/mem_root_array.h"  // Mem_root_array
-#include "sql/sql_alloc.h"       // Sql_alloc
 #include "sql/sql_lex.h"
 
 class Opt_trace_context;
@@ -537,7 +536,7 @@ class Item_tree_walker
 /**
    Checks for queries which have DISTINCT.
 */
-class Distinct_check: public Item_tree_walker, public Sql_alloc
+class Distinct_check: public Item_tree_walker
 {
 public:
 
@@ -571,7 +570,7 @@ class Distinct_check: public Item_tree_walker, public Sql_alloc
 /**
    Checks for queries which have GROUP BY or aggregate functions.
 */
-class Group_check: public Item_tree_walker, public Sql_alloc
+class Group_check: public Item_tree_walker
 {
 public:
 

sql/auth/sql_auth_cache.h

@@ -42,7 +42,6 @@
 #include "mysql_time.h"                 // MYSQL_TIME
 #include "sql/auth/auth_common.h"
 #include "sql/auth/auth_internal.h" // List_of_authid, Authid
-#include "sql/sql_alloc.h"              // Sql_alloc
 #include "sql/sql_connect.h"            // USER_RESOURCES
 #include "violite.h"                    // SSL_type
 
@@ -257,7 +256,7 @@ class acl_entry
 };
 
 
-class GRANT_COLUMN :public Sql_alloc
+class GRANT_COLUMN
 {
 public:
   ulong rights;
@@ -266,7 +265,7 @@ class GRANT_COLUMN :public Sql_alloc
 };
 
 
-class GRANT_NAME :public Sql_alloc
+class GRANT_NAME
 {
 public:
   ACL_HOST_AND_IP host;
@@ -432,7 +431,7 @@ typedef std::unordered_map<std::string, Role_vertex_descriptor >
   Role_index_map;
 
 /** Container for global, schema, table/view and routine ACL maps */
-class Acl_map : public Sql_alloc
+class Acl_map
 {
 public:
   Acl_map(Security_context *sctx, uint64 ver);

sql/discrete_interval.h

@@ -27,7 +27,7 @@
     0 <= k <= (auto_inc_interval_values-1) }
   Where "increment" is maintained separately by the user of this class (and is
   currently only thd->variables.auto_increment_increment).
-  It mustn't derive from Sql_alloc, because SET INSERT_ID needs to
+  It mustn't be allocated on a MEM_ROOT, because SET INSERT_ID needs to
   allocate memory which must stay allocated for use by the next statement.
 */
 class Discrete_interval {

sql/event_data_objects.cc

@@ -44,7 +44,6 @@
 #include "sql/log.h"
 #include "sql/psi_memory_key.h"
 #include "sql/sp_head.h"
-#include "sql/sql_alloc.h"
 #include "sql/sql_class.h"
 #include "sql/sql_const.h"
 #include "sql/sql_digest_stream.h"
@@ -117,8 +116,7 @@ static inline LEX_CSTRING make_lex_cstring(MEM_ROOT *mem_root,
   Event_creation_ctx -- creation context of events.
 */
 
-class Event_creation_ctx :public Stored_program_creation_ctx,
-                          public Sql_alloc
+class Event_creation_ctx :public Stored_program_creation_ctx
 {
 public:
   static bool create_event_creation_ctx(const dd::Event &event_obj,

sql/event_parse_data.h

@@ -23,7 +23,6 @@
 #include "my_dbug.h"
 #include "my_inttypes.h"
 #include "my_time.h"                 // interval_type
-#include "sql/sql_alloc.h"           // Sql_alloc
 
 class Item;
 class THD;
@@ -34,7 +33,7 @@ class sp_name;
 #define EVEX_MICROSECOND_UNSUP  -6
 #define EVEX_MAX_INTERVAL_VALUE 1000000000L
 
-class Event_parse_data : public Sql_alloc
+class Event_parse_data
 {
 public:
   /*

sql/field.h

@@ -43,7 +43,6 @@
 #include "mysqld_error.h"                       // ER_*
 #include "nullable.h"
 #include "sql/gis/srid.h"
-#include "sql/sql_alloc.h"
 #include "sql/sql_bitmap.h"
 #include "sql/sql_const.h"
 #include "sql/sql_error.h"                      // Sql_condition
@@ -619,7 +618,7 @@ void copy_integer(uchar *to, size_t to_length,
   If one field contains such an object, it means the field
   is a genereated one.
 */
-class Generated_column: public Sql_alloc
+class Generated_column
 {
 public:
   /**
@@ -724,7 +723,7 @@ class Proto_field
   virtual bool send_text(Protocol *protocol)= 0;
 };
 
-class Field: public Proto_field, public Sql_alloc
+class Field: public Proto_field
 {
   Field(const Item &);				/* Prevent use of these */
   void operator=(Field &);
@@ -4624,7 +4623,7 @@ class Field_bit_as_char: public Field_bit {
   Create field class for CREATE TABLE
 */
 
-class Create_field :public Sql_alloc
+class Create_field
 {
 public:
   const char *field_name;
@@ -4775,7 +4774,8 @@ class Create_field :public Sql_alloc
   A class for sending info to the client
 */
 
-class Send_field :public Sql_alloc {
+class Send_field
+{
  public:
   const char *db_name;
   const char *table_name,*org_table_name;
@@ -4797,7 +4797,8 @@ class Send_field :public Sql_alloc {
   A class for quick copying data to fields
 */
 
-class Copy_field :public Sql_alloc {
+class Copy_field
+{
   /**
     Convenience definition of a copy function returned by
     get_copy_func.

sql/filesort.h

@@ -22,7 +22,6 @@
 #include "my_base.h"                            /* ha_rows */
 #include "my_dbug.h"
 #include "my_inttypes.h"
-#include "sql/sql_alloc.h"                      /* Sql_alloc */
 
 class Addon_fields;
 class Field;
@@ -37,7 +36,7 @@ enum class Addon_fields_status;
 /**
   Sorting related info.
 */
-class Filesort: public Sql_alloc
+class Filesort
 {
 public:
   /// The QEP entry for the table to be sorted

sql/ha_ndb_ddl_fk.cc

@@ -48,7 +48,7 @@ typedef NdbDictionary::ForeignKey NDBFK;
   Unlike indexes, no references to global dictionary are kept.
 */
 
-struct Ndb_fk_item : Sql_alloc
+struct Ndb_fk_item
 {
   FOREIGN_KEY_INFO f_key_info;
   int update_action;    // NDBFK::FkAction
@@ -57,7 +57,7 @@ struct Ndb_fk_item : Sql_alloc
   bool is_parent;
 };
 
-struct Ndb_fk_data : Sql_alloc
+struct Ndb_fk_data
 {
   List<Ndb_fk_item> list;
   uint cnt_child;

sql/ha_ndbcluster_cond.cc

@@ -116,7 +116,7 @@ static const negated_function_mapping neg_map[]=
   Ndb_item with type == NDB_END_COND.
   NOT items represent negated conditions and generate NAND/NOR groups.
 */
-class Ndb_item : public Sql_alloc
+class Ndb_item
 {
 public:
   Ndb_item(NDB_ITEM_TYPE item_type) : type(item_type) {}
@@ -313,7 +313,7 @@ class Ndb_item : public Sql_alloc
   This class implements a linked list used for storing a
   serialization of the Item tree for condition pushdown.
  */
-class Ndb_cond : public Sql_alloc
+class Ndb_cond
 {
  public:
   Ndb_cond() : ndb_item(NULL), next(NULL), prev(NULL) {}
@@ -348,7 +348,7 @@ class Ndb_cond : public Sql_alloc
   prepared for handling several (C1 AND C2 ...) if the logic for
   pushing conditions is extended in sql_select.
 */
-class Ndb_cond_stack : public Sql_alloc
+class Ndb_cond_stack
 {
  public:
   Ndb_cond_stack() : ndb_cond(NULL), next(NULL) {}
@@ -373,7 +373,7 @@ class Ndb_cond_stack : public Sql_alloc
   to check specific order (currently used for detecting support for
   <field> LIKE <string>|<func>, but not <string>|<func> LIKE <field>).
  */
-class Ndb_expect_stack : public Sql_alloc
+class Ndb_expect_stack
 {
   static const uint MAX_EXPECT_ITEMS = Item::VIEW_FIXER_ITEM + 1;
   static const uint MAX_EXPECT_FIELD_TYPES = MYSQL_TYPE_GEOMETRY + 1;
@@ -557,7 +557,7 @@ Ndb_expect_stack(): collation(NULL), length(0), max_length(0), next(NULL)
   Ndb_expect_stack* next;
 };
 
-class Ndb_rewrite_context : public Sql_alloc
+class Ndb_rewrite_context
 {
 public:
   Ndb_rewrite_context(Item_func *func)
@@ -579,7 +579,7 @@ class Ndb_rewrite_context : public Sql_alloc
   if the condition found is supported, and information what is
   expected next in the tree inorder for the condition to be supported.
 */
-class Ndb_cond_traverse_context : public Sql_alloc
+class Ndb_cond_traverse_context
 {
  public:
    Ndb_cond_traverse_context(TABLE *tab, const NdbDictionary::Table *ndb_tab,

sql/handler.h

@@ -48,7 +48,6 @@
 #include "sql/dd/string_type.h"
 #include "sql/discrete_interval.h" // Discrete_interval
 #include "sql/key.h"
-#include "sql/sql_alloc.h"
 #include "sql/sql_const.h"     // SHOW_COMP_OPTION
 #include "sql/sql_list.h"      // SQL_I_List
 #include "sql/sql_plugin_ref.h" // plugin_ref
@@ -2225,12 +2224,11 @@ struct KEY_PAIR
   as early as during check_if_supported_inplace_alter().
 
   The SQL layer is responsible for destroying the object.
-  The class extends Sql_alloc so the memory will be mem root allocated.
 
   @see Alter_inplace_info
 */
 
-class inplace_alter_handler_ctx : public Sql_alloc
+class inplace_alter_handler_ctx
 {
 public:
   inplace_alter_handler_ctx() {}
@@ -3006,7 +3004,7 @@ class Handler_share
   Wrapper for struct ft_hints.
 */
 
-class Ft_hints: public Sql_alloc
+class Ft_hints
 {
 private:
   struct ft_hints hints;
@@ -3497,7 +3495,7 @@ class Ft_hints: public Sql_alloc
     get_partition_handler()
 */
 
-class handler :public Sql_alloc
+class handler
 {
   friend class Partition_handler;
 public:

sql/histograms/histogram.h

@@ -45,7 +45,6 @@
 #include "my_base.h"                   // ha_rows
 #include "sql/histograms/value_map_type.h"
 #include "sql/memroot_allocator.h"     // Memroot_allocator
-#include "sql/sql_alloc.h"             // Sql_alloc
 #include "sql/stateless_allocator.h"   // Stateless_allocator
 
 class Item;
@@ -131,7 +130,7 @@ enum class enum_operator
 /**
   Histogram base class.
 */
-class Histogram : public Sql_alloc
+class Histogram
 {
 public:
   /// All supported histogram types in MySQL.

sql/item.h

@@ -45,7 +45,6 @@
 #include "sql/mem_root_array.h"
 #include "sql/my_decimal.h" // my_decimal
 #include "sql/parse_tree_node_base.h" // Parse_tree_node
-#include "sql/sql_alloc.h"
 #include "sql/sql_array.h" // Bounds_checked_array
 #include "sql/sql_const.h"
 #include "sql/table.h"
@@ -414,7 +413,7 @@ class Item_name_string: public Name_string
   structure before and after INSERT/CREATE and its SELECT to make correct
   field name resolution.
 */
-struct Name_resolution_context: Sql_alloc
+struct Name_resolution_context
 {
   /*
     The name resolution context to search in when an Item cannot be
@@ -5378,7 +5377,7 @@ class Item_cache;
   It caches a value, which is representative of the group, and can compare it
   to another row, and update its value when entering a new group.
 */
-class Cached_item :public Sql_alloc
+class Cached_item
 {
 protected:
   Item *item;              ///< The item whose value to cache.