Added sql_alloc.h

- Moved declaration of Sql_alloc from Sql_list.h as they are independent
  structures.

7 files changed, 66 insertions, 50 deletions

diff --git a/sql/event_parse_data.h b/sql/event_parse_data.h
index e1aed36aa01..d2e14d74cf8 100644
--- a/sql/event_parse_data.h
+++ b/sql/event_parse_data.h
@@ -17,7 +17,7 @@
 #ifndef _EVENT_PARSE_DATA_H_
 #define _EVENT_PARSE_DATA_H_
 
-#include "sql_list.h"                           /* Sql_alloc */
+#include "sql_alloc.h"
 
 class Item;
 class THD;
diff --git a/sql/filesort.h b/sql/filesort.h
index 2b4f7ac2654..bd1d81f91ef 100644
--- a/sql/filesort.h
+++ b/sql/filesort.h
@@ -17,7 +17,7 @@
 #define FILESORT_INCLUDED
 
 #include "my_base.h"                            /* ha_rows */
-#include "sql_list.h"                           /* Sql_alloc */
+#include "sql_alloc.h"
 #include "filesort_utils.h"
 
 class SQL_SELECT;
diff --git a/sql/parse_file.h b/sql/parse_file.h
index fdc74f3a809..19c7883f8cc 100644
--- a/sql/parse_file.h
+++ b/sql/parse_file.h
@@ -18,7 +18,7 @@
 #define _PARSE_FILE_H_
 
 #include "sql_string.h"                         // LEX_STRING
-#include "sql_list.h"                           // Sql_alloc
+#include "sql_alloc.h"                          // Sql_alloc
 
 class THD;
 
diff --git a/sql/sql_alloc.h b/sql/sql_alloc.h
new file mode 100644
index 00000000000..36fe665c475
--- /dev/null
+++ b/sql/sql_alloc.h
@@ -0,0 +1,54 @@
+#ifndef SQL_ALLOC_INCLUDED
+#define SQL_ALLOC_INCLUDED
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates.
+   Copyright (c) 2017, MariaDB AB
+
+   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
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include <my_sys.h>                    /* alloc_root, MEM_ROOT, TRASH */
+
+THD *thd_get_current_thd();
+
+/* mysql standard class memory allocator */
+
+class Sql_alloc
+{
+public:
+  static void *operator new(size_t size) throw ()
+  {
+    return thd_alloc(thd_get_current_thd(), size);
+  }
+  static void *operator new[](size_t size) throw ()
+  {
+    return thd_alloc(thd_get_current_thd(), size);
+  }
+  static void *operator new[](size_t size, MEM_ROOT *mem_root) throw ()
+  { return alloc_root(mem_root, size); }
+  static void *operator new(size_t size, MEM_ROOT *mem_root) throw ()
+  { return alloc_root(mem_root, size); }
+  static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); }
+  static void operator delete(void *ptr, MEM_ROOT *mem_root)
+  { /* never called */ }
+  static void operator delete[](void *ptr, MEM_ROOT *mem_root)
+  { /* never called */ }
+  static void operator delete[](void *ptr, size_t size) { TRASH(ptr, size); }
+#ifdef HAVE_valgrind
+  bool dummy_for_valgrind;
+  inline Sql_alloc() :dummy_for_valgrind(0) {}
+#else
+  inline Sql_alloc() {}
+#endif
+  inline ~Sql_alloc() {}
+};
+#endif /* SQL_ALLOC_INCLUDED */
diff --git a/sql/sql_crypt.h b/sql/sql_crypt.h
index 3df554e9d31..e61776713b6 100644
--- a/sql/sql_crypt.h
+++ b/sql/sql_crypt.h
@@ -21,7 +21,7 @@
 #pragma interface			/* gcc class implementation */
 #endif
 
-#include "sql_list.h"                           /* Sql_alloc */
+#include "sql_alloc.h"                       /* Sql_alloc */
 #include "my_rnd.h"                          /* rand_struct */
 
 class SQL_CRYPT :public Sql_alloc
diff --git a/sql/sql_error.h b/sql/sql_error.h
index f020b9cc789..12344ccf78c 100644
--- a/sql/sql_error.h
+++ b/sql/sql_error.h
@@ -17,12 +17,12 @@
 #ifndef SQL_ERROR_H
 #define SQL_ERROR_H
 
-#include "sql_list.h" /* Sql_alloc, MEM_ROOT */
-#include "m_string.h" /* LEX_STRING */
-#include "sql_string.h"                        /* String */
-#include "sql_plist.h" /* I_P_List */
-#include "mysql_com.h" /* MYSQL_ERRMSG_SIZE */
-#include "my_time.h"   /* MYSQL_TIME */
+#include "sql_list.h" 	/* Sql_alloc, MEM_ROOT, list */
+#include "m_string.h"		/* LEX_STRING */
+#include "sql_string.h"       /* String */
+#include "sql_plist.h"        /* I_P_List */
+#include "mysql_com.h"        /* MYSQL_ERRMSG_SIZE */
+#include "my_time.h"          /* MYSQL_TIME */
 #include "decimal.h"
 
 class THD;
diff --git a/sql/sql_list.h b/sql/sql_list.h
index 031cbd4683e..422b7943aa9 100644
--- a/sql/sql_list.h
+++ b/sql/sql_list.h
@@ -19,46 +19,7 @@
 #pragma interface			/* gcc class implementation */
 #endif
 
-#include <my_sys.h>                    /* alloc_root, TRASH, MY_WME,
-                                          MY_FAE, MY_ALLOW_ZERO_PTR */
-#include "m_string.h"                           /* bfill */
-
-THD *thd_get_current_thd();
-
-/* mysql standard class memory allocator */
-
-class Sql_alloc
-{
-public:
-  static void *operator new(size_t size) throw ()
-  {
-    return thd_alloc(thd_get_current_thd(), size);
-  }
-  static void *operator new[](size_t size) throw ()
-  {
-    return thd_alloc(thd_get_current_thd(), size);
-  }
-  static void *operator new[](size_t size, MEM_ROOT *mem_root) throw ()
-  { return alloc_root(mem_root, size); }
-  static void *operator new(size_t size, MEM_ROOT *mem_root) throw ()
-  { return alloc_root(mem_root, size); }
-  static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); }
-  static void operator delete(void *ptr, MEM_ROOT *mem_root)
-  { /* never called */ }
-  static void operator delete[](void *ptr, MEM_ROOT *mem_root)
-  { /* never called */ }
-  static void operator delete[](void *ptr, size_t size) { TRASH(ptr, size); }
-#ifdef HAVE_valgrind
-  bool dummy_for_valgrind;
-  inline Sql_alloc() :dummy_for_valgrind(0) {}
-  inline ~Sql_alloc() {}
-#else
-  inline Sql_alloc() {}
-  inline ~Sql_alloc() {}
-#endif
-
-};
-
+#include "sql_alloc.h"
 
 /**
   Simple intrusive linked list.
@@ -67,6 +28,7 @@ public:
           a pointer to the first element in the list and a indirect
           reference to the last element.
 */
+
 template <typename T>
 class SQL_I_List :public Sql_alloc
 {