Commit 94b5f4dc authored by marko's avatar marko

branches/5.1: ha_innobase::check_if_incompatible_data(): Check

HA_CREATE_USED_ROW_FORMAT before comparing row_type.  Previously,
the comparison was incorrectly guarded by the presence of an
AUTO_INCREMENT attribute.
parent 28e5a626
...@@ -7935,7 +7935,7 @@ bool ha_innobase::check_if_incompatible_data( ...@@ -7935,7 +7935,7 @@ bool ha_innobase::check_if_incompatible_data(
} }
/* Check that row format didn't change */ /* Check that row format didn't change */
if ((info->used_fields & HA_CREATE_USED_AUTO) && if ((info->used_fields & HA_CREATE_USED_ROW_FORMAT) &&
get_row_type() != info->row_type) { get_row_type() != info->row_type) {
return COMPATIBLE_DATA_NO; return COMPATIBLE_DATA_NO;
......
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