mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refs #5429, make fix for mariadb-5.2.10

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

5
storage/tokudb/ha_tokudb_alter_51.cc
View file

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