summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-02-21 22:36:05 +0300
committerAlexander Nozdrin <alik@sun.com>2010-02-21 22:36:05 +0300
commiteb79ef1535f092a2e3fee9cf514ff0c581de0bd2 (patch)
tree551412956bc864d32aedd08989fa82ca72339d00 /sql/share
parentb5706ded0e519a3f0ad2ace630178e13faad5ca5 (diff)
parentd1ad316a59b6bd48dec94433ffe982ddfc376e35 (diff)
downloadmariadb-git-eb79ef1535f092a2e3fee9cf514ff0c581de0bd2.tar.gz
Auto-merge from mysql-next-mr.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 1eb8ae9dd82..7ea8c75e43e 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6319,3 +6319,5 @@ ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_DIRECT
ER_SPATIAL_MUST_HAVE_GEOM_COL 42000
eng "A SPATIAL index may only contain a geometrical type column"
+ER_TOO_LONG_INDEX_COMMENT
+ eng "Comment for index '%-.64s' is too long (max = %lu)"