database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Applied all changes from Igor and Sanja

Browse Source
This commit is contained in:
Michael Widenius
2013-06-15 18:32:08 +03:00
parent 3143ad589a
commit 5f1f2fc0e4
162 changed files with 11704 additions and 6298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_derived.cc
View File

@ -666,9 +666,9 @@ exit:
if (derived->view)
{
if (thd->is_error() &&
(thd->stmt_da->sql_errno() == ER_BAD_FIELD_ERROR ||
thd->stmt_da->sql_errno() == ER_FUNC_INEXISTENT_NAME_COLLISION ||
thd->stmt_da->sql_errno() == ER_SP_DOES_NOT_EXIST))
(thd->get_stmt_da()->sql_errno() == ER_BAD_FIELD_ERROR ||
thd->get_stmt_da()->sql_errno() == ER_FUNC_INEXISTENT_NAME_COLLISION ||
thd->get_stmt_da()->sql_errno() == ER_SP_DOES_NOT_EXIST))
{
thd->clear_error();
my_error(ER_VIEW_INVALID, MYF(0), derived->db,