summaryrefslogtreecommitdiff
path: root/include
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 /include
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 'include')
-rw-r--r--include/mysql_com.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index f4c023721de..c35a604781d 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -114,6 +114,10 @@ enum enum_server_command
#define FIELD_IN_PART_FUNC_FLAG (1 << 19)/* Field part of partition func */
#define FIELD_IN_ADD_INDEX (1<< 20) /* Intern: Field used in ADD INDEX */
#define FIELD_IS_RENAMED (1<< 21) /* Intern: Field is being renamed */
+#define FIELD_FLAGS_STORAGE_MEDIA 22 /* Field storage media, bit 22-23,
+ reserved by MySQL Cluster */
+#define FIELD_FLAGS_COLUMN_FORMAT 24 /* Field column format, bit 24-25,
+ reserved by MySQL Cluster */
#define REFRESH_GRANT 1 /* Refresh grant tables */
#define REFRESH_LOG 2 /* Start on new log file */