summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorAndrei Elkin <aelkin@mysql.com>2009-11-06 18:35:04 +0200
committerAndrei Elkin <aelkin@mysql.com>2009-11-06 18:35:04 +0200
commit69d6fcbd3b225c177c4e0e3af65aa2cf9494eff3 (patch)
tree44a02955b1dc18fc2e94cd0b4dc6ef62cd81d936 /sql/handler.h
parentea84da107a8d8f6b061d00dcf76c3369f8a96868 (diff)
parent684b1d39ac7eab6ff5d9095aaa25dcea35b88a28 (diff)
downloadmariadb-git-69d6fcbd3b225c177c4e0e3af65aa2cf9494eff3.tar.gz
merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/handler.h b/sql/handler.h
index ea0b134e53d..632c262b59a 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -923,6 +923,15 @@ typedef struct st_ha_create_information
ulong key_block_size;
SQL_LIST merge_list;
handlerton *db_type;
+ /**
+ Row type of the table definition.
+
+ Defaults to ROW_TYPE_DEFAULT for all non-ALTER statements.
+ For ALTER TABLE defaults to ROW_TYPE_NOT_USED (means "keep the current").
+
+ Can be changed either explicitly by the parser.
+ If nothing speficied inherits the value of the original table (if present).
+ */
enum row_type row_type;
uint null_bits; /* NULL bits at start of record */
uint options; /* OR of HA_CREATE_ options */