summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2021-09-15 19:18:11 +0300
committerMonty <monty@mariadb.org>2021-09-15 19:27:34 +0300
commitf03fee06b0f4bdb1d754d987db3375cade02445e (patch)
treef2c29dd977bc5013aff31536868941d83bffa333 /include
parent6be0ddae5edb080219226525c4423300f063081d (diff)
downloadmariadb-git-f03fee06b0f4bdb1d754d987db3375cade02445e.tar.gz
Improve error messages from Ariatmp-10.5-monty
- Error on commit now returns HA_ERR_COMMIT_ERROR instead of HA_ERR_INTERNAL_ERROR - If checkpoint fails, it will now print out where it failed.
Diffstat (limited to 'include')
-rw-r--r--include/handler_ername.h1
-rw-r--r--include/my_base.h3
-rw-r--r--include/my_handler_errors.h3
3 files changed, 5 insertions, 2 deletions
diff --git a/include/handler_ername.h b/include/handler_ername.h
index fe55062e6fb..c9d09717a14 100644
--- a/include/handler_ername.h
+++ b/include/handler_ername.h
@@ -79,3 +79,4 @@
{ "HA_ERR_ABORTED_BY_USER", HA_ERR_ABORTED_BY_USER, "" },
{ "HA_ERR_DISK_FULL", HA_ERR_DISK_FULL, "" },
{ "HA_ERR_INCOMPATIBLE_DEFINITION", HA_ERR_INCOMPATIBLE_DEFINITION, "" },
+{ "HA_ERR_COMMIT_ERROR", HA_ERR_COMMIT_ERROR, "" },
diff --git a/include/my_base.h b/include/my_base.h
index 6a9a14fa91e..b4e7c1c7707 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -525,7 +525,8 @@ enum ha_base_keytype {
#define HA_ERR_TABLESPACE_MISSING 194 /* Missing Tablespace */
#define HA_ERR_SEQUENCE_INVALID_DATA 195
#define HA_ERR_SEQUENCE_RUN_OUT 196
-#define HA_ERR_LAST 196 /* Copy of last error nr * */
+#define HA_ERR_COMMIT_ERROR 197
+#define HA_ERR_LAST 197 /* Copy of last error nr * */
/* Number of different errors */
#define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1)
diff --git a/include/my_handler_errors.h b/include/my_handler_errors.h
index faf7b9f459e..69b1566557d 100644
--- a/include/my_handler_errors.h
+++ b/include/my_handler_errors.h
@@ -107,7 +107,8 @@ static const char *handler_error_messages[]=
"Foreign key cascade delete/update exceeds max depth",
"Tablespace is missing for a table",
"Sequence has been run out",
- "Sequence values are conflicting"
+ "Sequence values are conflicting",
+ "Error during commit"
};
#endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */