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/table.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/table.cc')
| -rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 7bdfa65d94b..598942d2257 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1489,7 +1489,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head, const uchar field_flags= format_section_fields[i]; const uchar field_storage= (field_flags & STORAGE_TYPE_MASK); const uchar field_column_format= - ((field_flags >> COLUMN_FORMAT_SHIFT)& STORAGE_TYPE_MASK); + ((field_flags >> COLUMN_FORMAT_SHIFT)& COLUMN_FORMAT_MASK); DBUG_PRINT("debug", ("field flags: %u, storage: %u, column_format: %u", field_flags, field_storage, field_column_format)); (void)field_storage; /* Reserved by and used in MySQL Cluster */ |