diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-12-15 16:38:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-12-18 16:16:42 +0100 |
| commit | 03e91ce324465e465468021edd050c3b73d4cee3 (patch) | |
| tree | 8a1abf1699d8686fa9605b1b6895153079dec825 /sql/handler.h | |
| parent | c1e5fef05d87038fff8b55ba763d082a5bec5d78 (diff) | |
| download | mariadb-git-03e91ce324465e465468021edd050c3b73d4cee3.tar.gz | |
MDEV-14641 Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine
make sure that mysql_create_frm_image() and fast_alter_partition_table()
use the same code to derive HA_OPTION_PACK_RECORD from
create_info->row_type.
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/handler.h b/sql/handler.h index 772f2e68dab..c422094b4d5 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1666,6 +1666,13 @@ struct HA_CREATE_INFO used_fields|= (HA_CREATE_USED_CHARSET | HA_CREATE_USED_DEFAULT_CHARSET); return false; } + ulong table_options_with_row_type() + { + if (row_type == ROW_TYPE_DYNAMIC || row_type == ROW_TYPE_PAGE) + return table_options | HA_OPTION_PACK_RECORD; + else + return table_options; + } }; |