Commit df3bedb8 authored by Sergey Vojtovich's avatar Sergey Vojtovich

MDEV-4864 - Merge tests for EXCHANGE PARTITION feature

Added partition_exchange test.

Do not set HA_OPTION_PACK_RECORD for InnoDB specific row formats
(e.g. COMPACT, REDUNDANT). Adjusted mysql_compare_tables() accordingly.
parent c6d9c36f
This diff is collapsed.
This diff is collapsed.
...@@ -4191,8 +4191,8 @@ handler *mysql_create_frm_image(THD *thd, ...@@ -4191,8 +4191,8 @@ 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_info->row_type != ROW_TYPE_FIXED && if (create_info->row_type == ROW_TYPE_DYNAMIC ||
create_info->row_type != ROW_TYPE_DEFAULT) create_info->row_type == ROW_TYPE_PAGE)
db_options|= HA_OPTION_PACK_RECORD; db_options|= HA_OPTION_PACK_RECORD;
if (!(file= get_new_handler((TABLE_SHARE*) 0, thd->mem_root, if (!(file= get_new_handler((TABLE_SHARE*) 0, thd->mem_root,
...@@ -6019,6 +6019,7 @@ bool mysql_compare_tables(TABLE *table, ...@@ -6019,6 +6019,7 @@ bool mysql_compare_tables(TABLE *table,
mimic behavior of create_table_impl(). mimic behavior of create_table_impl().
*/ */
if (create_info->row_type == ROW_TYPE_DYNAMIC || if (create_info->row_type == ROW_TYPE_DYNAMIC ||
create_info->row_type == ROW_TYPE_PAGE ||
(tmp_new_field->flags & BLOB_FLAG) || (tmp_new_field->flags & BLOB_FLAG) ||
(tmp_new_field->sql_type == MYSQL_TYPE_VARCHAR && (tmp_new_field->sql_type == MYSQL_TYPE_VARCHAR &&
create_info->row_type != ROW_TYPE_FIXED)) create_info->row_type != ROW_TYPE_FIXED))
......
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