Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

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 },
 };