From b385fdc6cca542c5b5a0671bc141a8b9b29e72a4 Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Fri, 26 Jul 2013 13:11:43 +0400 Subject: [PATCH] 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. --- sql/sql_table.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sql/sql_table.cc b/sql/sql_table.cc index d3c70f8bacf..47487861f74 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4192,8 +4192,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_table_mode != C_ALTER_TABLE_FRM_ONLY && - create_info->row_type != ROW_TYPE_FIXED && + if (create_info->row_type != ROW_TYPE_FIXED && create_info->row_type != ROW_TYPE_DEFAULT) db_options|= HA_OPTION_PACK_RECORD;