mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refs #5431, fix handlerton in mariadb-5.2.10

Browse source 
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@47683 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Zardosht Kasheff 2013-04-17 00:02:14 -04:00 committed by Yoni Fogel
parent 54c0c450d3
commit cdb237e531
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/tokudb/ha_tokudb_alter_51.cc
View file

@ -211,9 +211,7 @@ ha_tokudb::check_if_supported_alter(TABLE *altered_table,
// Check if the row format (read: compression) has // Check if the row format (read: compression) has
// changed as part of this alter statment. // changed as part of this alter statment.
#ifndef MARIADB_BASE_VERSION
bool has_row_format_changes = alter_flags->is_set(HA_ALTER_ROW_FORMAT); bool has_row_format_changes = alter_flags->is_set(HA_ALTER_ROW_FORMAT);
#endif
bool has_non_indexing_changes = false; bool has_non_indexing_changes = false;
bool has_non_dropped_changes = false; bool has_non_dropped_changes = false;
bool has_non_added_changes = false; bool has_non_added_changes = false;
@ -366,11 +364,9 @@ ha_tokudb::check_if_supported_alter(TABLE *altered_table,
else if (has_added_columns && !has_non_added_changes) { else if (has_added_columns && !has_non_added_changes) {
retval = HA_ALTER_SUPPORTED_WAIT_LOCK; retval = HA_ALTER_SUPPORTED_WAIT_LOCK;
} }
#ifndef MARIADB_BASE_VERSION
else if (has_row_format_changes && !has_non_row_format_changes && tables_have_same_keys_and_columns(table, altered_table, true)) { 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
else if (has_auto_inc_change && !has_non_auto_inc_change && tables_have_same_keys_and_columns(table, altered_table, true)) { 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;
} }