diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 18:08:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 18:08:38 +0300 |
| commit | a8b04c3ee083232570d9fe6f3062d91a19ceddea (patch) | |
| tree | 9f2e8c1cb76a01e22c4e0d79a738a5d6fdbde8a5 | |
| parent | 6be56dd1c8a37eb98f4b7bc1507ca5991a2a1f61 (diff) | |
| download | mariadb-git-a8b04c3ee083232570d9fe6f3062d91a19ceddea.tar.gz | |
MDEV-12353: Remove a trace of pre-MDEV-13564 crash-upgrade
In commit f8a9f906679e1d1ab026c245f7d24c652050d8b3
we removed support for crash-upgrade from older versions,
but forgot to remove a check for recovering TRUNCATE TABLE
if MariaDB 10.2.18 or 10.3.9 or earlier were killed and
we are attempting to upgrade to MariaDB 10.5.2 or later.
Already MariaDB 10.4 would refuse to recover such TRUNCATE
operations.
| -rw-r--r-- | storage/innobase/log/log0recv.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index 93865602c98..cdf292552bf 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -2535,17 +2535,6 @@ void recv_apply_hashed_log_recs(bool last_batch) if (recv_sys.pages.empty()) { goto done; - } - - if (!log_sys.log.subformat && !srv_force_recovery - && srv_undo_tablespaces_open) { - ib::error() << "Recovery of separately logged" - " TRUNCATE operations is no longer supported." - " Set innodb_force_recovery=1" - " if no *trunc.log files exist"; - recv_sys.found_corrupt_log = true; - mutex_exit(&recv_sys.mutex); - return; } else { const char* msg = last_batch ? "Starting final batch to recover " |