1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup All_share_tables_list definition

Browse Source
This commit is contained in:
Sergey Vojtovich 2016-03-22 18:01:40 +04:00
parent 1fc2c63fb1
commit c42ffc1ca8
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sql/table.h
View File

@ -491,9 +491,6 @@ TABLE_CATEGORY get_table_category(const LEX_STRING *db,
const LEX_STRING *name);
struct TABLE_share;
struct All_share_tables;
typedef struct st_table_field_type
{
LEX_STRING name;
@ -1009,7 +1006,7 @@ private:
One should use methods of I_P_List template instead.
*/
TABLE *share_all_next, **share_all_prev;
friend struct All_share_tables;
friend struct TDC_element;
public:
@ -1410,19 +1407,6 @@ 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;
}
};
enum enum_schema_table_state
{
NOT_PROCESSED= 0,

2
sql/table_cache.cc
View File

@ -841,7 +841,7 @@ bool tdc_remove_table(THD *thd, enum_tdc_remove_table_type remove_type,
const char *db, const char *table_name,
bool kill_delayed_threads)
{
I_P_List <TABLE, TABLE_share> purge_tables;
TDC_element::TABLE_list purge_tables;
TABLE *table;
TDC_element *element;
uint my_refs= 1;

4
sql/table_cache.h
View File

@ -31,7 +31,9 @@ public:
TABLE_SHARE *share;
typedef I_P_List <TABLE, TABLE_share> TABLE_list;
typedef I_P_List <TABLE, All_share_tables> All_share_tables_list;
typedef I_P_List <TABLE, I_P_List_adapter<TABLE, &TABLE::share_all_next,
&TABLE::share_all_prev> >
All_share_tables_list;
/**
Protects ref_count, m_flush_tickets, all_tables, free_tables, flushed,
all_tables_refs.