diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2015-01-21 12:03:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2015-01-21 12:03:02 +0100 |
| commit | d9c01e4b4ac6a7e2bdbcaf71819fa3d4f5269840 (patch) | |
| tree | 4f86f6ce4e298430e313ed70f2225b3f29485f51 /sql/handler.h | |
| parent | d854a254b84595b3a8f3a4d8083a2b997d59912e (diff) | |
| parent | 8bc712e481a18976853fa57a7be77aab6159d431 (diff) | |
| download | mariadb-git-d9c01e4b4ac6a7e2bdbcaf71819fa3d4f5269840.tar.gz | |
5.5 merge
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/handler.h b/sql/handler.h index 5bba570f8ec..4222270e9c4 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -452,8 +452,10 @@ enum legacy_db_type enum row_type { ROW_TYPE_NOT_USED=-1, ROW_TYPE_DEFAULT, ROW_TYPE_FIXED, ROW_TYPE_DYNAMIC, ROW_TYPE_COMPRESSED, - ROW_TYPE_REDUNDANT, ROW_TYPE_COMPACT, - ROW_TYPE_PAGE }; + ROW_TYPE_REDUNDANT, ROW_TYPE_COMPACT, ROW_TYPE_PAGE }; + +/* not part of the enum, so that it shouldn't be in switch(row_type) */ +#define ROW_TYPE_MAX ((uint)ROW_TYPE_PAGE + 1) /* Specifies data storage format for individual columns */ enum column_format_type { @@ -1389,6 +1391,9 @@ static inline sys_var *find_hton_sysvar(handlerton *hton, st_mysql_sys_var *var) #define HTON_NO_BINLOG_ROW_OPT (1 << 9) #define HTON_SUPPORTS_EXTENDED_KEYS (1 <<10) //supports extended keys +// MySQL compatibility. Unused. +#define HTON_SUPPORTS_FOREIGN_KEYS (1 << 0) //Foreign key constraint supported. + class Ha_trx_info; struct THD_TRANS @@ -1570,7 +1575,7 @@ class partition_info; struct st_partition_iter; -enum ha_choice { HA_CHOICE_UNDEF, HA_CHOICE_NO, HA_CHOICE_YES }; +enum ha_choice { HA_CHOICE_UNDEF, HA_CHOICE_NO, HA_CHOICE_YES, HA_CHOICE_MAX }; enum enum_stats_auto_recalc { HA_STATS_AUTO_RECALC_DEFAULT= 0, HA_STATS_AUTO_RECALC_ON, |