diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-08 14:23:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-08 14:23:21 +0300 |
| commit | 44ab6cba762e23a992e7c3bfd8f4319e56e08fe8 (patch) | |
| tree | cd5558c4abe1e80d9282792299f327396f2eb188 | |
| parent | 960f0344a21af4bd8d422b9bfb9a617947d7541d (diff) | |
| download | mariadb-git-44ab6cba762e23a992e7c3bfd8f4319e56e08fe8.tar.gz | |
Cleanup: Remove unused error code DB_FORCED_ABORT
MariaDB never supported this form of preemption via high-priority
transactions. This error code shold not have been added in the
first place, in commit 2e814d4702d71a04388386a9f591d14a35980bfe.
| -rw-r--r-- | storage/innobase/include/db0err.h | 5 | ||||
| -rw-r--r-- | storage/innobase/ut/ut0ut.cc | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/storage/innobase/include/db0err.h b/storage/innobase/include/db0err.h index f70a65890c9..037821a89e7 100644 --- a/storage/innobase/include/db0err.h +++ b/storage/innobase/include/db0err.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2015, 2018, MariaDB Corporation. +Copyright (c) 2015, 2022, MariaDB Corporation. 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 the Free Software @@ -148,9 +148,6 @@ enum dberr_t { DB_IO_PARTIAL_FAILED, /*!< Partial IO request failed */ - DB_FORCED_ABORT, /*!< Transaction was forced to rollback - by a higher priority transaction */ - DB_TABLE_CORRUPT, /*!< Table/clustered index is corrupted */ diff --git a/storage/innobase/ut/ut0ut.cc b/storage/innobase/ut/ut0ut.cc index 7f7be193175..8a4e1151101 100644 --- a/storage/innobase/ut/ut0ut.cc +++ b/storage/innobase/ut/ut0ut.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2017, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2021, MariaDB Corporation. +Copyright (c) 2017, 2022, MariaDB Corporation. 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 the Free Software @@ -486,9 +486,6 @@ ut_strerr( return("Table is encrypted but decrypt failed."); case DB_IO_PARTIAL_FAILED: return("Partial IO failed"); - case DB_FORCED_ABORT: - return("Transaction aborted by another higher priority " - "transaction"); case DB_COMPUTE_VALUE_FAILED: return("Compute generated column failed"); case DB_NO_FK_ON_S_BASE_COL: |