diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | sql/sql_table.cc | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c06b12a5b12..9399c839a2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,6 @@ ENDIF(NOT MAX_INDEXES) IF (${MAX_INDEXES} GREATER 128) MESSAGE(FATAL_ERROR "MAX_INDEXES values greater than 128 is not supported!") ENDIF() -MESSAGE(STATUS "Configuring with MAX_INDEXES = ${MAX_INDEXES}") IF(UNIX AND NOT APPLE) # Note, that generally one should not change settings depending diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 5af13273130..8fa24b49d88 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -5934,8 +5934,9 @@ remove_key: alter_info->flags&= ~(Alter_info::ALTER_ADD_INDEX | 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::FOREIGN_KEY : Alter_drop::KEY; Alter_drop *ad= new Alter_drop(type, key->name.str, FALSE); |