summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2003-01-28 17:42:08 +0100
committerunknown <serg@serg.mysql.com>2003-01-28 17:42:08 +0100
commit73284c938465e9266ca7456e8b1112e2bbc1d9a5 (patch)
tree37e31feff36633416e5c16cb0499afefcd9336c4 /extra
parenta29d85072d7f6cd45586e0931affd053a1db94bd (diff)
downloadmariadb-git-73284c938465e9266ca7456e8b1112e2bbc1d9a5.tar.gz
low-level error messages cleanup
extra/perror.c: error messages fixups include/my_base.h: error codes fixups myisam/mi_open.c: correct error reported myisam/myisamchk.c: correct error reported myisammrg/myrg_open.c: correct error reported sql/ha_innodb.cc: correct error reported sql/ha_isam.cc: reorder table file extensions to get better error on "cannot open the table" sql/ha_myisam.cc: reorder table file extensions to get better error on "cannot open the table" sql/ha_myisammrg.cc: correct error reported sql/handler.cc: correct error reported
Diffstat (limited to 'extra')
-rw-r--r--extra/perror.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/extra/perror.c b/extra/perror.c
index e22ce467949..a2951bff66a 100644
--- a/extra/perror.c
+++ b/extra/perror.c
@@ -59,8 +59,10 @@ static HA_ERRORS ha_errlist[]=
{ 121,"Duplicate key on write or update" },
{ 123,"Someone has changed the row since it was read; Update with is recoverable" },
{ 124,"Wrong index given to function" },
- { 126,"Index file is crashed / Wrong file format" },
+ { 126,"Index file is crashed" },
{ 127,"Record-file is crashed" },
+ { 128,"Out of memory" },
+ { 130,"Incorrect file format" },
{ 131,"Command not supported by database" },
{ 132,"Old database file" },
{ 133,"No record read before update" },
@@ -73,7 +75,7 @@ static HA_ERRORS ha_errlist[]=
{ 140,"Wrong create options"},
{ 141,"Duplicate unique key or constraint on write or update"},
{ 142,"Unknown character set used"},
- { 143,"Conflicting table definition between MERGE and mapped table"},
+ { 143,"Conflicting table definitions in sub-tables of MERGE 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"},
@@ -81,6 +83,8 @@ static HA_ERRORS ha_errlist[]=
{ 148,"Updates are not allowed under a read only transactions"},
{ 149,"Lock deadlock; Retry transaction"},
{ 150,"Foreign key constraint is incorrectly formed"},
+ { 151,"Cannot add a child row"},
+ { 152,"Cannot delete a parent row"},
{ -30999, "DB_INCOMPLETE: Sync didn't finish"},
{ -30998, "DB_KEYEMPTY: Key/data deleted or never created"},
{ -30997, "DB_KEYEXIST: The key/data pair already exists"},