summaryrefslogtreecommitdiff
path: root/sql/table.cc
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
commit9f74930de671fe261193b4ae198b77761fbbcdc7 (patch)
treeef20b1214af011ce8ef6a3fb904fb115e723cb71 /sql/table.cc
parenta6ccad60b46d25e4bf0833262f1b96ba2712c7a4 (diff)
parentbbe29a00d3ca24d4aa9c8c3b7c3f7bd8bcbd3389 (diff)
downloadmariadb-git-9f74930de671fe261193b4ae198b77761fbbcdc7.tar.gz
merged 5.0-bugteam to 5.1-bugteam
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 066bbc953fa..7e8d5ac98b4 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -3341,6 +3341,7 @@ void TABLE_LIST::hide_view_error(THD *thd)
if (thd->main_da.sql_errno() == ER_BAD_FIELD_ERROR ||
thd->main_da.sql_errno() == ER_SP_DOES_NOT_EXIST ||
+ thd->main_da.sql_errno() == ER_FUNC_INEXISTENT_NAME_COLLISION ||
thd->main_da.sql_errno() == ER_PROCACCESS_DENIED_ERROR ||
thd->main_da.sql_errno() == ER_COLUMNACCESS_DENIED_ERROR ||
thd->main_da.sql_errno() == ER_TABLEACCESS_DENIED_ERROR ||