Commit c2d6db86 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

refs #5429, make fix for maria 5.5. previous checkin here accidentally...

refs #5429, make fix for maria 5.5. previous checkin here accidentally disabled hot auto inc, this puts it back

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@47375 c7de825b-a66e-492c-adef-691d508d4ae1
parent b0474df2
...@@ -210,19 +210,19 @@ ha_tokudb::check_if_supported_inplace_alter(TABLE *altered_table, Alter_inplace_ ...@@ -210,19 +210,19 @@ ha_tokudb::check_if_supported_inplace_alter(TABLE *altered_table, Alter_inplace_
result = HA_ALTER_INPLACE_EXCLUSIVE_LOCK; result = HA_ALTER_INPLACE_EXCLUSIVE_LOCK;
} }
} }
#ifndef MARIADB_BASE_VERSION
else if (only_flags(handler_flags, Alter_inplace_info::CHANGE_CREATE_OPTION)) { else if (only_flags(handler_flags, Alter_inplace_info::CHANGE_CREATE_OPTION)) {
HA_CREATE_INFO *create_info = ha_alter_info->create_info; HA_CREATE_INFO *create_info = ha_alter_info->create_info;
// alter auto_increment // alter auto_increment
if (only_flags(create_info->used_fields, HA_CREATE_USED_AUTO)) { if (only_flags(create_info->used_fields, HA_CREATE_USED_AUTO)) {
result = HA_ALTER_INPLACE_EXCLUSIVE_LOCK; result = HA_ALTER_INPLACE_EXCLUSIVE_LOCK;
} else }
// alter row_format // alter row_format
if (only_flags(create_info->used_fields, HA_CREATE_USED_ROW_FORMAT)) { #ifndef MARIADB_BASE_VERSION
else if (only_flags(create_info->used_fields, HA_CREATE_USED_ROW_FORMAT)) {
result = HA_ALTER_INPLACE_EXCLUSIVE_LOCK; result = HA_ALTER_INPLACE_EXCLUSIVE_LOCK;
} }
}
#endif #endif
}
// turn not supported into error if the slow alter table (copy) is disabled // turn not supported into error if the slow alter table (copy) is disabled
if (result == HA_ALTER_INPLACE_NOT_SUPPORTED && get_disable_slow_alter(thd)) { if (result == HA_ALTER_INPLACE_NOT_SUPPORTED && get_disable_slow_alter(thd)) {
......
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