1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
This commit is contained in:
Sergei Golubchik
2015-11-20 09:15:30 +01:00
parent df25018c2a
commit e52c753ab9
2 changed files with 2 additions and 2 deletions

View File

@@ -64,7 +64,6 @@ ENDIF(NOT MAX_INDEXES)
IF (${MAX_INDEXES} GREATER 128) IF (${MAX_INDEXES} GREATER 128)
MESSAGE(FATAL_ERROR "MAX_INDEXES values greater than 128 is not supported!") MESSAGE(FATAL_ERROR "MAX_INDEXES values greater than 128 is not supported!")
ENDIF() ENDIF()
MESSAGE(STATUS "Configuring with MAX_INDEXES = ${MAX_INDEXES}")
IF(UNIX AND NOT APPLE) IF(UNIX AND NOT APPLE)
# Note, that generally one should not change settings depending # Note, that generally one should not change settings depending

View File

@@ -5934,8 +5934,9 @@ remove_key:
alter_info->flags&= ~(Alter_info::ALTER_ADD_INDEX | alter_info->flags&= ~(Alter_info::ALTER_ADD_INDEX |
Alter_info::ADD_FOREIGN_KEY); Alter_info::ADD_FOREIGN_KEY);
} }
else if (key->or_replace()) else
{ {
DBUG_ASSERT(key->or_replace());
Alter_drop::drop_type type= (key->type == Key::FOREIGN_KEY) ? Alter_drop::drop_type type= (key->type == Key::FOREIGN_KEY) ?
Alter_drop::FOREIGN_KEY : Alter_drop::KEY; Alter_drop::FOREIGN_KEY : Alter_drop::KEY;
Alter_drop *ad= new Alter_drop(type, key->name.str, FALSE); Alter_drop *ad= new Alter_drop(type, key->name.str, FALSE);