summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-05-27 18:19:44 +0300
committerGeorgi Kodinov <joro@sun.com>2009-05-27 18:19:44 +0300
commitc675beab98d90e2f1a606c17d106740d1394071a (patch)
treeef20b1214af011ce8ef6a3fb904fb115e723cb71 /sql/share
parentc8a7b7914203a95c30ce45e800f7676744248bf7 (diff)
parent80730df7d634e1a620c864d6665d6e66ccad447a (diff)
downloadmariadb-git-c675beab98d90e2f1a606c17d106740d1394071a.tar.gz
merged 5.0-bugteam to 5.1-bugteam
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 2dfc5310643..7c92c827c87 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -6177,3 +6177,6 @@ ER_TOO_LONG_TABLE_COMMENT
ER_TOO_LONG_FIELD_COMMENT
eng "Comment for field '%-.64s' is too long (max = %lu)"
por "Comentário para o campo '%-.64s' é longo demais (max = %lu)"
+
+ER_FUNC_INEXISTENT_NAME_COLLISION 42000
+ eng "FUNCTION %s does not exist. Check the 'Function Name Parsing and Resolution' section in the Reference Manual"