summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorkostja@bodhi.local <>2006-08-30 00:45:33 +0400
committerkostja@bodhi.local <>2006-08-30 00:45:33 +0400
commitf8d34e10300ccf987bc8461a9581a7d5cfadcb29 (patch)
tree55ee75a4f6e2dfc6ac630c5e0f0e66445bae20fb /sql/share
parent4761ea5c82d9b843aba9ee1fb0a889a1237e6fbd (diff)
parent3bf609b7f2b73555b1e241dc7c354818b0bbbc5a (diff)
downloadmariadb-git-f8d34e10300ccf987bc8461a9581a7d5cfadcb29.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-14897
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index e90f54608e1..d10f66e3878 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5623,3 +5623,9 @@ 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_USERNAME
+ eng "user name"
+ER_HOSTNAME
+ eng "host name"
+ER_WRONG_STRING_LENGTH
+ eng "String '%-.70s' is too long for %s (should be no longer than %d)"