diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-07 14:38:21 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-07 14:38:21 +0200 |
| commit | 0b4ae6724f2707841c50f88d8c8598f2a0cdef4a (patch) | |
| tree | 3f081364c6782fd8f9837abc0f2482b426b4d67e /storage/innobase | |
| parent | 82187a1221467c7d193fca60a11a020ab4228e4a (diff) | |
| download | mariadb-git-0b4ae6724f2707841c50f88d8c8598f2a0cdef4a.tar.gz | |
Fixup MDEV-21429: Correct a definition
INNOBASE_ALTER_NOVALIDATE: Remove the set of operations
INNOBASE_ONLINE_CREATE that was accidentally included in the
definition.
In the merge of 82187a1221467c7d193fca60a11a020ab4228e4a to 10.3
(in commit eda719793acd90f6157bcb825722dab674376bf4) the flags
were defined correctly.
This bug was caught by the test innodb_zip.index_large_prefix.
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 64b1a806e44..eee0e43d73f 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -103,8 +103,7 @@ static const Alter_inplace_info::HA_ALTER_FLAGS INNOBASE_FOREIGN_OPERATIONS /** Operations that InnoDB cares about and can perform without validation */ static const Alter_inplace_info::HA_ALTER_FLAGS INNOBASE_ALTER_NOVALIDATE - = INNOBASE_ONLINE_CREATE - | INNOBASE_FOREIGN_OPERATIONS + = INNOBASE_FOREIGN_OPERATIONS | Alter_inplace_info::DROP_INDEX | Alter_inplace_info::DROP_UNIQUE_INDEX | Alter_inplace_info::ALTER_COLUMN_NAME @@ -115,6 +114,7 @@ static const Alter_inplace_info::HA_ALTER_FLAGS INNOBASE_ALTER_NOVALIDATE /** Operations that InnoDB cares about and can perform without rebuild */ static const Alter_inplace_info::HA_ALTER_FLAGS INNOBASE_ALTER_NOREBUILD = INNOBASE_ALTER_NOVALIDATE + | INNOBASE_ONLINE_CREATE | Alter_inplace_info::ALTER_COLUMN_EQUAL_PACK_LENGTH | Alter_inplace_info::ADD_VIRTUAL_COLUMN; |