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/sql_table.cc | |
| 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/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 9549884bc4e..7d37c559e20 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4405,10 +4405,7 @@ handler *mysql_create_frm_image(THD *thd, set_table_default_charset(thd, create_info, (char*) db); - db_options= create_info->table_options; - if (create_info->row_type == ROW_TYPE_DYNAMIC || - create_info->row_type == ROW_TYPE_PAGE) - db_options|= HA_OPTION_PACK_RECORD; + db_options= create_info->table_options_with_row_type(); if (!(file= get_new_handler((TABLE_SHARE*) 0, thd->mem_root, create_info->db_type))) |