summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-02-22 19:50:27 +0100
committerSergei Golubchik <serg@mariadb.org>2017-02-28 16:19:44 +0100
commit370cf70136778b4b89bc3d3d2dfc8a35c7f98478 (patch)
treec221b832e1a751d76835aab9fd978f96c57799db /sql/sql_table.cc
parent6a12c05347beb85a95318568e5f78221bde73b38 (diff)
downloadmariadb-git-370cf70136778b4b89bc3d3d2dfc8a35c7f98478.tar.gz
MDEV-11757 KEY_BLOCK_SIZE strangeness when UNCOMPRESSing COMPRESSed InnoDB tables
in ALTER TABLE ... DROP KEY, ADD KEY, don't forget to compare old and new keys' block sizes. If they differ - the key definition has changed.
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 5fde13c1f88..ef1b348d2ce 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -6429,6 +6429,9 @@ static bool fill_alter_inplace_info(THD *thd,
new_key->user_defined_key_parts))
goto index_changed;
+ if (table_key->block_size != new_key->block_size)
+ goto index_changed;
+
if (engine_options_differ(table_key->option_struct, new_key->option_struct,
table->file->ht->index_options))
goto index_changed;