Commit f5cb6895 authored by Sergei Golubchik's avatar Sergei Golubchik

fix for maria.maria test

parent be631f90
......@@ -3210,11 +3210,16 @@ bool ha_maria::check_if_incompatible_data(HA_CREATE_INFO *create_info,
{
DBUG_ENTER("check_if_incompatible_data");
uint options= table->s->db_options_in_use;
enum ha_choice page_checksum= table->s->page_checksum;
if (page_checksum == HA_CHOICE_UNDEF)
page_checksum= file->s->options & HA_OPTION_PAGE_CHECKSUM ? HA_CHOICE_YES
: HA_CHOICE_NO;
if (create_info->auto_increment_value != stats.auto_increment_value ||
create_info->data_file_name != data_file_name ||
create_info->index_file_name != index_file_name ||
create_info->page_checksum != table->s->page_checksum ||
create_info->page_checksum != page_checksum ||
create_info->transactional != table->s->transactional ||
(maria_row_type(create_info) != data_file_type &&
create_info->row_type != ROW_TYPE_DEFAULT) ||
......
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