summaryrefslogtreecommitdiff
path: root/sql/table.h
diff options
context:
space:
mode:
authorMagnus Blåudd <magnus.blaudd@oracle.com>2011-03-04 09:41:29 +0100
committerMagnus Blåudd <magnus.blaudd@oracle.com>2011-03-04 09:41:29 +0100
commit6c85d6535781870e9d35a0f00ace9ef42edf3e90 (patch)
tree91078f8e09a7d3bf446e8c6c1896bde1a0a20ad7 /sql/table.h
parent44b41979bd4767ccffa6450ccfcf331d3bad7b9b (diff)
downloadmariadb-git-6c85d6535781870e9d35a0f00ace9ef42edf3e90.tar.gz
Bug#60111 storage type for table not saved in .frm
- Add new "format section" in extra data segment with additional table and column properties. This was originally introduced in 5.1.20 based MySQL Cluster - Remove hardcoded STORAGE DISK for table and instead output the real storage format used. Keep both TABLESPACE and STORAGE inside same version guard. - Implement default version of handler::get_tablespace_name() since tablespace is now available in share and it's unnecessary for each handler to implement. (the function could actually be removed totally now). - Add test for combinations of TABLESPACE and STORAGE with CREATE TABLE and ALTER TABLE - Add test to show that 5.5 now can read a .frm file created by MySQL Cluster 7.0.22. Although it does not yet show the column level attributes, they are read.
Diffstat (limited to 'sql/table.h')
-rw-r--r--sql/table.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h
index 39e9ef2e0dd..bd8c66173f4 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -609,6 +609,8 @@ struct TABLE_SHARE
}
enum row_type row_type; /* How rows are stored */
enum tmp_table_type tmp_table;
+ enum ha_storage_media default_storage_media;
+ char *tablespace;
uint ref_count; /* How many TABLE objects uses this */
uint blob_ptr_size; /* 4 or 8 */