diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-17 23:43:53 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-17 23:43:53 +0300 |
| commit | ffe994614f09f79104a20fe75b1e2986d062523a (patch) | |
| tree | 6197f5bbc2fc564444d37f990227096a4582226f /extra/perror.c | |
| parent | 45ea63fec3b9cf740c363508730bb2ce63de719a (diff) | |
| download | mariadb-git-ffe994614f09f79104a20fe75b1e2986d062523a.tar.gz | |
Added unique error for DEADLOCK
Include missing man pages into binary distribution
BitKeeper/deleted/.del-make_mysql_pkg.sh~c616a18bed4b9c2:
Delete: support-files/make_mysql_pkg.sh
Docs/manual.texi:
Changelog
extra/perror.c:
Added missing error codes
include/my_base.h:
Added unique error for DEADLOCK
include/mysql.h:
Portability fix for the LCC windows compiler
include/mysqld_error.h:
Added unique error for DEADLOCK
scripts/make_binary_distribution.sh:
Include missing man pages into binary distribution
sql/ha_berkeley.cc:
Added unique error for DEADLOCK
sql/ha_berkeley.h:
Added unique error for DEADLOCK
sql/handler.h:
Added unique error for DEADLOCK
sql/mysqld.cc:
Portability fix
sql/share/czech/errmsg.txt:
Added unique error for DEADLOCK
sql/share/danish/errmsg.txt:
Added unique error for DEADLOCK
sql/share/dutch/errmsg.txt:
Added unique error for DEADLOCK
sql/share/english/errmsg.txt:
Added unique error for DEADLOCK
sql/share/estonian/errmsg.txt:
Added unique error for DEADLOCK
sql/share/french/errmsg.txt:
Added unique error for DEADLOCK
sql/share/german/errmsg.txt:
Added unique error for DEADLOCK
sql/share/greek/errmsg.txt:
Added unique error for DEADLOCK
sql/share/hungarian/errmsg.txt:
Added unique error for DEADLOCK
sql/share/italian/errmsg.txt:
Added unique error for DEADLOCK
sql/share/japanese/errmsg.txt:
Added unique error for DEADLOCK
sql/share/korean/errmsg.txt:
Added unique error for DEADLOCK
sql/share/norwegian-ny/errmsg.txt:
Added unique error for DEADLOCK
sql/share/norwegian/errmsg.txt:
Added unique error for DEADLOCK
sql/share/polish/errmsg.txt:
Added unique error for DEADLOCK
sql/share/portuguese/errmsg.txt:
Added unique error for DEADLOCK
sql/share/romanian/errmsg.txt:
Added unique error for DEADLOCK
sql/share/russian/errmsg.txt:
Added unique error for DEADLOCK
sql/share/slovak/errmsg.txt:
Added unique error for DEADLOCK
sql/share/spanish/errmsg.txt:
Added unique error for DEADLOCK
sql/share/swedish/errmsg.txt:
Added unique error for DEADLOCK
sql/share/ukrainian/errmsg.txt:
Added unique error for DEADLOCK
Diffstat (limited to 'extra/perror.c')
| -rw-r--r-- | extra/perror.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/extra/perror.c b/extra/perror.c index 5fc1f75785b..038665438d9 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -67,6 +67,10 @@ static HA_ERRORS ha_errlist[]= { 143,"Conflicting table definition between MERGE and mapped table"}, { 144,"Table is crashed and last repair failed"}, { 145,"Table was marked as crashed and should be repaired"}, + { 146,"Lock timed out; Retry transaction"}, + { 147,"Lock table is full; Restart program with a larger locktable"}, + { 148,"Updates are not allowed under a read only transactions"}, + { 149,"Lock deadlock; Retry transaction"}, { 0,NullS }, }; |