diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-13 22:29:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-13 22:29:17 +0200 |
| commit | f5cb6895cb366ab352371936d44e6f7d68c17c42 (patch) | |
| tree | ee81f752d6c84dae5d26e90e3e1b134718d0471c /storage | |
| parent | be631f9099e6a1c1561226f6dab6a3f9324264a7 (diff) | |
| download | mariadb-git-f5cb6895cb366ab352371936d44e6f7d68c17c42.tar.gz | |
fix for maria.maria test
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/maria/ha_maria.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 24a6eb2ba80..1c37c4f811d 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -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) || |