summaryrefslogtreecommitdiff
path: root/sql/sql_derived.cc
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/sql_derived.cc
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/sql_derived.cc')
-rw-r--r--sql/sql_derived.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index 830d1b7c36f..46718f74bd4 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -148,6 +148,7 @@ exit:
if (orig_table_list->view)
{
if (thd->net.last_errno == ER_BAD_FIELD_ERROR ||
+ thd->net.last_errno == ER_FUNC_INEXISTENT_NAME_COLLISION ||
thd->net.last_errno == ER_SP_DOES_NOT_EXIST)
{
thd->clear_error();