summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-08-08 10:12:24 -0700
committerjimw@mysql.com <>2005-08-08 10:12:24 -0700
commit4cdca3486df2209705aed99195610605e6daa8ef (patch)
treec6fdc76c0fe7d5436b4fc3c1c2e7315bf86f6b9c /sql/share
parent0a7b2963d6c78fe884760f5f0285354549191d83 (diff)
parent268a68ad08a0f2a19d863b19485bf1444a1519d3 (diff)
downloadmariadb-git-4cdca3486df2209705aed99195610605e6daa8ef.tar.gz
Merge mysql.com:/home/jimw/my/mysql-5.0-6080
into mysql.com:/home/jimw/my/mysql-5.0-clean
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 c47b3bb7dd9..2d46a2192b9 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5391,3 +5391,5 @@ ER_TOO_LONG_BODY 42000 S1009
ER_WARN_CANT_DROP_DEFAULT_KEYCACHE
eng "Cannot drop default keycache"
ger "Der Default-Keycache kann nicht gelöscht werden"
+ER_TOO_BIG_DISPLAYWIDTH 42000 S1009
+ eng "Display width out of range for column '%-.64s' (max = %d)"