summaryrefslogtreecommitdiff
path: root/include/my_base.h
diff options
context:
space:
mode:
authormonty@work.mysql.com <>2001-09-17 23:26:00 +0200
committermonty@work.mysql.com <>2001-09-17 23:26:00 +0200
commiteb9cbe2cba89f696e782c53f8ce668a8f301cc31 (patch)
treea544afdc5cdc3dba7918f6a0d8f1341a2fe74ff2 /include/my_base.h
parent51c9fd9c9da9667b141093aa1324c61bf2f58f48 (diff)
parentdb61a3456e89d3afeb9494b4ef9185435bc55b86 (diff)
downloadmariadb-git-eb9cbe2cba89f696e782c53f8ce668a8f301cc31.tar.gz
merge
Diffstat (limited to 'include/my_base.h')
-rw-r--r--include/my_base.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_base.h b/include/my_base.h
index c4c1a0763fd..800e623bc2c 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -217,6 +217,7 @@ enum ha_base_keytype {
#define HA_ERR_LOCK_WAIT_TIMEOUT 146
#define HA_ERR_LOCK_TABLE_FULL 147
#define HA_ERR_READ_ONLY_TRANSACTION 148 /* Updates not allowed */
+#define HA_ERR_LOCK_DEADLOCK 149
/* Other constants */