summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-05-27 16:05:29 +0300
committerGeorgi Kodinov <joro@sun.com>2009-05-27 16:05:29 +0300
commit80730df7d634e1a620c864d6665d6e66ccad447a (patch)
tree84a2cbd1035921bbaa22dbb65522b2d16b307602 /sql/share
parentf54beb2dccb921296a4c0bec1aa45e5dd6e53a69 (diff)
downloadmariadb-git-80730df7d634e1a620c864d6665d6e66ccad447a.tar.gz
Bug #38159: Function parsing problem generates misleading error message
Added a more detailed error message on calling an ambiguous missing function. mysql-test/r/ps.result: Bug #38159: fixed existing tests mysql-test/r/sp-error.result: Bug #38159: test case mysql-test/t/ps.test: Bug #38159: fixed existing tests mysql-test/t/sp-error.test: Bug #38159: test case sql/item_func.cc: Bug #38159: generate more detailed error message sql/share/errmsg.txt: Bug #38159: add a more detailed error message sql/sql_derived.cc: Bug #38159: treat the detailed error message the same way as the generic one sql/sql_lex.cc: Bug #38159: - detect if the token is ambiguous and print the appropriate error. - backport is_lex_native_function() from 5.1 sql/sql_lex.h: Bug #38159: detect if the token is ambiguous and print the appropriate error. sql/sql_yacc.yy: Bug #38159: generate more detailed error message sql/table.cc: Bug #38159: treat the detailed error message the same way as the generic one
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 c688ba88b7b..6113b18579f 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5649,3 +5649,6 @@ ER_XA_RBTIMEOUT XA106
eng "XA_RBTIMEOUT: Transaction branch was rolled back: took too long"
ER_XA_RBDEADLOCK XA102
eng "XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected"
+
+ER_FUNC_INEXISTENT_NAME_COLLISION 42000
+ eng "FUNCTION %s does not exist. Check the 'Function Name Parsing and Resolution' section in the Reference Manual"