mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.0' into 10.1

Browse source
This commit is contained in:
Sergei Golubchik 2016-08-25 12:40:09 +02:00
commit 6b1863b830
381 changed files with 5154 additions and 3894 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storage/innobase/handler/handler0alter.cc
View file

@ -230,7 +230,7 @@ innobase_need_rebuild(
& Alter_inplace_info::ADD_INDEX) ||
(ha_alter_info->handler_flags
& Alter_inplace_info::ADD_FOREIGN_KEY))) {
for (ulint i = 0; i < ha_alter_info->key_count; i++) {
for (ulint i = 0; i < ha_alter_info->index_add_count; i++) {
const KEY* key = &ha_alter_info->key_info_buffer[
ha_alter_info->index_add_buffer[i]];
@ -241,13 +241,13 @@ innobase_need_rebuild(
/* Field used on added index is renamed on
this same alter table. We need table
rebuild. */
if (field->flags & FIELD_IS_RENAMED) {
if (field && field->flags & FIELD_IS_RENAMED) {
return (true);
}
}
}
}
return(!!(ha_alter_info->handler_flags & INNOBASE_ALTER_REBUILD));
}