1 files changed, 15 insertions, 10 deletions
diff --git a/sql/table.h b/sql/table.h
index 81869f6754d..c207588a049 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -2,6 +2,7 @@
 #define TABLE_INCLUDED
 /* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
    Copyright (c) 2009, 2014, SkySQL Ab.
+   Copyright (c) 2016, 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
@@ -1012,7 +1013,7 @@ private:
      One should use methods of I_P_List template instead.
   */
   TABLE *share_all_next, **share_all_prev;
-  friend struct TDC_element;
+  friend struct All_share_tables;
 
 public:
 
@@ -1435,6 +1436,19 @@ struct TABLE_share
   }
 };
 
+struct All_share_tables
+{
+  static inline TABLE **next_ptr(TABLE *l)
+  {
+    return &l->share_all_next;
+  }
+  static inline TABLE ***prev_ptr(TABLE *l)
+  {
+    return &l->share_all_prev;
+  }
+};
+
+typedef I_P_List <TABLE, All_share_tables> All_share_tables_list;
 
 enum enum_schema_table_state
 { 
@@ -2662,15 +2676,6 @@ inline bool is_infoschema_db(const char *name)
 
 TYPELIB *typelib(MEM_ROOT *mem_root, List<String> &strings);
 
-/**
-  return true if the table was created explicitly.
-*/
-inline bool is_user_table(TABLE * table)
-{
-  const char *name= table->s->table_name.str;
-  return strncmp(name, tmp_file_prefix, tmp_file_prefix_length);
-}
-
 inline void mark_as_null_row(TABLE *table)
 {
   table->null_row=1;