database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Alexander Barkov
2017-03-31 16:40:29 +04:00
parent e191833d75 2f3d4bd566
commit f00a314f9a
1719 changed files with 29743 additions and 15779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_table.cc
View File

@@ -6476,6 +6476,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;