Commit 54c0c450 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

refs #5431, fix alter table for mysql 5.1

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@47678 c7de825b-a66e-492c-adef-691d508d4ae1
parent 07432617
...@@ -367,11 +367,11 @@ ha_tokudb::check_if_supported_alter(TABLE *altered_table, ...@@ -367,11 +367,11 @@ ha_tokudb::check_if_supported_alter(TABLE *altered_table,
retval = HA_ALTER_SUPPORTED_WAIT_LOCK; retval = HA_ALTER_SUPPORTED_WAIT_LOCK;
} }
#ifndef MARIADB_BASE_VERSION #ifndef MARIADB_BASE_VERSION
else if (has_row_format_changes && !has_non_row_format_changes) { else if (has_row_format_changes && !has_non_row_format_changes && tables_have_same_keys_and_columns(table, altered_table, true)) {
retval = HA_ALTER_SUPPORTED_WAIT_LOCK; retval = HA_ALTER_SUPPORTED_WAIT_LOCK;
} }
#endif #endif
else if (has_auto_inc_change && !has_non_auto_inc_change) { else if (has_auto_inc_change && !has_non_auto_inc_change && tables_have_same_keys_and_columns(table, altered_table, true)) {
retval = HA_ALTER_SUPPORTED_WAIT_LOCK; retval = HA_ALTER_SUPPORTED_WAIT_LOCK;
} }
else if (has_column_rename && !has_non_column_rename_changes) { else if (has_column_rename && !has_non_column_rename_changes) {
......
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