diff options
author | Magnus Blåudd <magnus.blaudd@oracle.com> | 2011-03-25 10:06:07 +0100 |
---|---|---|
committer | Magnus Blåudd <magnus.blaudd@oracle.com> | 2011-03-25 10:06:07 +0100 |
commit | 1c5d585ba596df84233f8710fbc115a6df22b36b (patch) | |
tree | 238d678c16d3add083d6610abdb1540607d12611 /sql/sql_show.cc | |
parent | 0be575b7c8a7d551e7b0ea011b715f5e808e2eab (diff) | |
download | mariadb-git-1c5d585ba596df84233f8710fbc115a6df22b36b.tar.gz |
Bug#60111 storage type for table not saved in .frm
(aka BUG#11766883)
- fix review comments
- Rewrite last usage of handler::get_tablespace_name to use
table->s->tablespace directly
- Remove(revert) the addition of default implementation for
handler::get_tablespace_name
- Add comments describing the new TABLE_SHARE members default_storage_media
and tablespace
- Fix usage of incorrect mask for column_format bits, i.e COLUMN_FORMAT_MASK
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r-- | sql/sql_show.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index c3dda3072f2..a93f06d9409 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -5503,12 +5503,9 @@ static void store_schema_partitions_record(THD *thd, TABLE *schema_table, strlen(part_elem->tablespace_name), cs); else { - char *ts= showing_table->file->get_tablespace_name(thd,0,0); + char *ts= showing_table->s->tablespace; if(ts) - { table->field[24]->store(ts, strlen(ts), cs); - my_free(ts); - } else table->field[24]->set_null(); } |