summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorsvoj@april.(none) <>2006-09-18 16:23:45 +0500
committersvoj@april.(none) <>2006-09-18 16:23:45 +0500
commitf21eadfc74eb31b3680a510fa5cf6f4f0b7e3403 (patch)
tree6d1754293628ba876befcd642131930d508976fa /sql/share
parentd8e27606e1716d674ce03588cb8e763fbc260b62 (diff)
parentb92f68d4593c0f0e01fcb211cdb4763d5bc369b9 (diff)
downloadmariadb-git-f21eadfc74eb31b3680a510fa5cf6f4f0b7e3403.tar.gz
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index d10f66e3878..05b31b1e8b2 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5623,6 +5623,8 @@ ER_NO_TRIGGERS_ON_SYSTEM_SCHEMA
eng "Triggers can not be created on system tables"
ER_REMOVED_SPACES
eng "Leading spaces are removed from name '%s'"
+ER_AUTOINC_READ_FAILED
+ eng "Failed to read auto-increment value from storage engine"
ER_USERNAME
eng "user name"
ER_HOSTNAME