summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-10-14 03:16:35 +0300
committermonty@donna.mysql.com <>2000-10-14 03:16:35 +0300
commit7ac13c89e62da94aab70d3e8e89d368cb7bc7e5c (patch)
tree1b0bc8c3909ac0c3e49a7d72615c583c9a72254d /extra
parent5134b08422d9e69228fe5f66a51f0e5f12c81e86 (diff)
downloadmariadb-git-7ac13c89e62da94aab70d3e8e89d368cb7bc7e5c.tar.gz
Fix of LEFT JOIN optimizer bug, problem with key cache on Windows and
a lot of portability issues.
Diffstat (limited to 'extra')
-rw-r--r--extra/perror.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/perror.c b/extra/perror.c
index af8f77e19be..ec523ecba0b 100644
--- a/extra/perror.c
+++ b/extra/perror.c
@@ -17,7 +17,7 @@
/* Return error-text for system error messages and nisam messages */
-#define PERROR_VERSION "2.5"
+#define PERROR_VERSION "2.6"
#include <global.h>
#include <my_sys.h>
@@ -62,7 +62,7 @@ static HA_ERRORS ha_errlist[]=
{ 138,"Unsupported extension used for table" },
{ 139,"Too big row (>= 16 M)"},
{ 140,"Wrong create options"},
- { 141,"Duplicate unique on write or update"},
+ { 141,"Duplicate unique key or constraint on write or update"},
{ 142,"Unknown character set used"},
{ 143,"Conflicting table definition between MERGE and mapped table"},
{ 144,"Table is crashed and last repair failed"},