diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-03 13:27:12 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-03 13:27:12 +0200 |
| commit | adc91387e3add6d9c850b7c2a44760deaceb3638 (patch) | |
| tree | c772c6339d2f715a1a50766e30790307e0658f3e /sql/sql_table.cc | |
| parent | bc28b305e538774eae4152b300cd323e9a724393 (diff) | |
| parent | 29c776cfd1e560846e394f39d79ae43ff7d70c61 (diff) | |
| download | mariadb-git-adc91387e3add6d9c850b7c2a44760deaceb3638.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index ebbec8c4c83..27d1b96886c 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -6450,6 +6450,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; |