Skip to content

Commit 44ab6cb

Browse files
committed
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 2e814d4.
1 parent 960f034 commit 44ab6cb

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

storage/innobase/include/db0err.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
33
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
4-
Copyright (c) 2015, 2018, MariaDB Corporation.
4+
Copyright (c) 2015, 2022, MariaDB Corporation.
55
66
This program is free software; you can redistribute it and/or modify it under
77
the terms of the GNU General Public License as published by the Free Software
@@ -148,9 +148,6 @@ enum dberr_t {
148148

149149
DB_IO_PARTIAL_FAILED, /*!< Partial IO request failed */
150150

151-
DB_FORCED_ABORT, /*!< Transaction was forced to rollback
152-
by a higher priority transaction */
153-
154151
DB_TABLE_CORRUPT, /*!< Table/clustered index is
155152
corrupted */
156153

storage/innobase/ut/ut0ut.cc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
33
Copyright (c) 1994, 2017, Oracle and/or its affiliates. All Rights Reserved.
4-
Copyright (c) 2017, 2021, MariaDB Corporation.
4+
Copyright (c) 2017, 2022, MariaDB Corporation.
55
66
This program is free software; you can redistribute it and/or modify it under
77
the terms of the GNU General Public License as published by the Free Software
@@ -486,9 +486,6 @@ ut_strerr(
486486
return("Table is encrypted but decrypt failed.");
487487
case DB_IO_PARTIAL_FAILED:
488488
return("Partial IO failed");
489-
case DB_FORCED_ABORT:
490-
return("Transaction aborted by another higher priority "
491-
"transaction");
492489
case DB_COMPUTE_VALUE_FAILED:
493490
return("Compute generated column failed");
494491
case DB_NO_FK_ON_S_BASE_COL:

0 commit comments

Comments
 (0)