summaryrefslogtreecommitdiff
path: root/storage/innobase/include/db0err.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-05-05 10:23:14 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-05-05 10:23:14 +0300
commitb132b8895e2e59df457e063451f186b53576b034 (patch)
tree565a5529facdca326b36d4418fae3522d8715e02 /storage/innobase/include/db0err.h
parent27980b0f83529725435dc8f37cb51878eb074d1d (diff)
parent4d59f45260547b3230f177498b6fa07a12647fdc (diff)
downloadmariadb-git-b132b8895e2e59df457e063451f186b53576b034.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/include/db0err.h')
-rw-r--r--storage/innobase/include/db0err.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/include/db0err.h b/storage/innobase/include/db0err.h
index 2110018b6d4..53e75e695ae 100644
--- a/storage/innobase/include/db0err.h
+++ b/storage/innobase/include/db0err.h
@@ -30,12 +30,13 @@ Created 5/24/1996 Heikki Tuuri
/* Do not include univ.i because univ.i includes this. */
enum dberr_t {
+ DB_SUCCESS,
+
DB_SUCCESS_LOCKED_REC = 9, /*!< like DB_SUCCESS, but a new
explicit record lock was created */
- DB_SUCCESS = 10,
/* The following are error codes */
- DB_ERROR,
+ DB_ERROR = 11,
DB_INTERRUPTED,
DB_OUT_OF_MEMORY,
DB_OUT_OF_FILE_SPACE,