diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-30 21:18:39 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-30 21:26:53 +0200 |
| commit | 921c5e931452301a09c84c53ffe35b81e6a1c71a (patch) | |
| tree | 4ff02c83f03590095fd48bf2d36b11077f752c49 /sql/ha_partition.cc | |
| parent | 33714d20658fcc8535c737fd02c64c7070adbac0 (diff) | |
| parent | 0c1f22061177fab63274a4429e38a4652964d7b8 (diff) | |
| download | mariadb-git-921c5e931452301a09c84c53ffe35b81e6a1c71a.tar.gz | |
Merge bb-10.2-ext into 10.3
MDEV-11415 Remove excessive undo logging during ALTER TABLE…ALGORITHM=COPY
Move a test from innodb.rename_table_debug to innodb.alter_copy.
ha_innobase::extra(HA_EXTRA_BEGIN_ALTER_COPY): Register id-versioned
tables so that mysql.transaction_registry will be updated, even for
empty tables that are subjected to ALTER TABLE…ALGORITHM=COPY.
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 8675aed3228..87c056e7bae 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2005, 2017, Oracle and/or its affiliates. - Copyright (c) 2009, 2017, MariaDB + Copyright (c) 2009, 2018, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -8897,6 +8897,9 @@ int ha_partition::extra(enum ha_extra_function operation) */ DBUG_RETURN(ER_UNSUPORTED_LOG_ENGINE); case HA_EXTRA_STARTING_ORDERED_INDEX_SCAN: + case HA_EXTRA_BEGIN_ALTER_COPY: + case HA_EXTRA_END_ALTER_COPY: + case HA_EXTRA_FAKE_START_STMT: DBUG_RETURN(loop_extra(operation)); default: { |