1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Merge branch '10.1' of github.com:MariaDB/server into 10.1

This commit is contained in:
Sergei Petrunia
2015-04-12 05:16:48 +03:00
347 changed files with 6532 additions and 9422 deletions

View File

@ -6383,6 +6383,14 @@ static bool fill_alter_inplace_info(THD *thd,
new_field->field->field_index != key_part->fieldnr - 1)
goto index_changed;
}
/* Check that key comment is not changed. */
if (table_key->comment.length != new_key->comment.length ||
(table_key->comment.length &&
memcmp(table_key->comment.str, new_key->comment.str,
table_key->comment.length) != 0))
goto index_changed;
continue;
index_changed: