summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-09-17 23:43:53 +0300
committermonty@hundin.mysql.fi <>2001-09-17 23:43:53 +0300
commit56cc14ab4c7cd43bbf4e39539f4c21a3d9e46808 (patch)
tree6197f5bbc2fc564444d37f990227096a4582226f /extra
parentcf80b8ae7894c21a826e800416fe7a7d3271e004 (diff)
downloadmariadb-git-56cc14ab4c7cd43bbf4e39539f4c21a3d9e46808.tar.gz
Added unique error for DEADLOCK
Include missing man pages into binary distribution
Diffstat (limited to 'extra')
-rw-r--r--extra/perror.c4
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 },
};