diff options
| author | Eugene Kosov <claprix@yandex.ru> | 2018-05-29 23:55:57 +0300 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2019-03-22 22:50:17 +0400 |
| commit | a07e29a0e5661d9506bdd63f92bb83f125aeac3b (patch) | |
| tree | 52d570cd4ccb2ad7c3e5aaa9d89e43cfc46158a5 | |
| parent | 53216091dd27f9bfc3cf4a47f0b883f878e7331d (diff) | |
| download | mariadb-git-a07e29a0e5661d9506bdd63f92bb83f125aeac3b.tar.gz | |
cleanup TABLE_SHARE
| -rw-r--r-- | sql/sql_show.cc | 6 | ||||
| -rw-r--r-- | sql/table.h | 9 |
2 files changed, 1 insertions, 14 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index e5dbfeed149..d9985406323 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -7288,11 +7288,7 @@ static void store_schema_partitions_record(THD *thd, TABLE *schema_table, strlen(part_elem->tablespace_name), cs); else { - char *ts= showing_table->s->tablespace; - if(ts) - table->field[24]->store(ts, strlen(ts), cs); - else - table->field[24]->set_null(); + table->field[24]->set_null(); } } return; diff --git a/sql/table.h b/sql/table.h index 72f516aebdb..b7c14e0a606 100644 --- a/sql/table.h +++ b/sql/table.h @@ -745,9 +745,6 @@ struct TABLE_SHARE /* For sequence tables, the current sequence state */ SEQUENCE *sequence; - /* Name of the tablespace used for this table */ - char *tablespace; - #ifdef WITH_PARTITION_STORAGE_ENGINE /* filled in when reading from frm */ bool auto_partitioned; @@ -847,12 +844,6 @@ struct TABLE_SHARE 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() { return (table_category == TABLE_CATEGORY_LOG); |