Commit b385fdc6 authored by Sergey Vojtovich's avatar Sergey Vojtovich

MDEV-4786 - merge 10.0-monty - 10.0

Fixed maria.maria and funcs_1.is_tables failure.

sql/sql_table.cc:
  C_ALTER_TABLE_FRM_ONLY lost it's meaning after merge of inplace alter:
  now it is used even if table is to be copied.
  Otherwise: how can row format change go without notifying storage engine?
  Removed check for create_table_mode for now, to be discussed.
parent 5845b83d
...@@ -4192,8 +4192,7 @@ handler *mysql_create_frm_image(THD *thd, ...@@ -4192,8 +4192,7 @@ handler *mysql_create_frm_image(THD *thd,
set_table_default_charset(thd, create_info, (char*) db); set_table_default_charset(thd, create_info, (char*) db);
db_options= create_info->table_options; db_options= create_info->table_options;
if (create_table_mode != C_ALTER_TABLE_FRM_ONLY && if (create_info->row_type != ROW_TYPE_FIXED &&
create_info->row_type != ROW_TYPE_FIXED &&
create_info->row_type != ROW_TYPE_DEFAULT) create_info->row_type != ROW_TYPE_DEFAULT)
db_options|= HA_OPTION_PACK_RECORD; db_options|= HA_OPTION_PACK_RECORD;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment