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

cleanup TABLE_SHARE

Browse Source
This commit is contained in:
Eugene Kosov 2018-05-29 23:55:57 +03:00 committed by Sergey Vojtovich
parent 53216091dd
commit a07e29a0e5
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_show.cc
View File

@ -7288,11 +7288,7 @@ static void store_schema_partitions_record(THD *thd, TABLE *schema_table,
strlen(part_elem->tablespace_name), cs); strlen(part_elem->tablespace_name), cs);
else else
{ {
char *ts= showing_table->s->tablespace; table->field[24]->set_null();
if(ts)
table->field[24]->store(ts, strlen(ts), cs);
else
table->field[24]->set_null();
} }
} }
return; return;

9
sql/table.h
View File

@ -745,9 +745,6 @@ struct TABLE_SHARE
/* For sequence tables, the current sequence state */ /* For sequence tables, the current sequence state */
SEQUENCE *sequence; SEQUENCE *sequence;
/* Name of the tablespace used for this table */
char *tablespace;
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
/* filled in when reading from frm */ /* filled in when reading from frm */
bool auto_partitioned; bool auto_partitioned;
@ -847,12 +844,6 @@ struct TABLE_SHARE
set_table_cache_key(key_buff, key_length); set_table_cache_key(key_buff, key_length);
} }
inline bool honor_global_locks()
{
return ((table_category == TABLE_CATEGORY_USER)
|| (table_category == TABLE_CATEGORY_SYSTEM));
}
inline bool require_write_privileges() inline bool require_write_privileges()
{ {
return (table_category == TABLE_CATEGORY_LOG); return (table_category == TABLE_CATEGORY_LOG);