diff options
| author | unknown <monty@work.mysql.com> | 2001-09-17 23:26:00 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-09-17 23:26:00 +0200 |
| commit | d8ae9669cd11f9c61105a9cbf19f9318a0e783fc (patch) | |
| tree | a544afdc5cdc3dba7918f6a0d8f1341a2fe74ff2 /include/my_base.h | |
| parent | 9f939ecce6ccf73c5192d721d826f0a2a58a9b3e (diff) | |
| parent | 9d62e4a05b1c8399787b624a90e0cab0aa42c57c (diff) | |
| download | mariadb-git-d8ae9669cd11f9c61105a9cbf19f9318a0e783fc.tar.gz | |
merge
Docs/manual.texi:
Auto merged
extra/perror.c:
Auto merged
include/my_base.h:
Auto merged
include/mysql.h:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
client/mysqltest.c:
Auto merged
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 1 |
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 */ |