1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup: TABLE_LIST::view_check_option

Browse Source 
don't prepare for checking view's CHECK OPTION, if
there is no CHECK OPTION in the first place.
This commit is contained in:
Sergei Golubchik 2017-09-21 10:03:40 +02:00
parent e84f5356c3
commit 1015196e0a
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sql/table.cc
View File

@ -4628,25 +4628,28 @@ void TABLE_LIST::cleanup_items()
int TABLE_LIST::view_check_option(THD *thd, bool ignore_failure) int TABLE_LIST::view_check_option(THD *thd, bool ignore_failure)
{ {
Counting_error_handler ceh; if (check_option)
thd->push_internal_handler(&ceh);
bool res= check_option && check_option->val_int() == 0;
thd->pop_internal_handler();
if (ceh.errors)
return(VIEW_CHECK_ERROR);
if (res)
{ {
TABLE_LIST *main_view= top_table(); Counting_error_handler ceh;
if (ignore_failure) thd->push_internal_handler(&ceh);
bool res= check_option->val_int() == 0;
thd->pop_internal_handler();
if (ceh.errors)
return(VIEW_CHECK_ERROR);
if (res)
{ {
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, TABLE_LIST *main_view= top_table();
ER_VIEW_CHECK_FAILED, ER(ER_VIEW_CHECK_FAILED), if (ignore_failure)
main_view->view_db.str, main_view->view_name.str); {
return(VIEW_CHECK_SKIP); push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
ER_VIEW_CHECK_FAILED, ER(ER_VIEW_CHECK_FAILED),
main_view->view_db.str, main_view->view_name.str);
return(VIEW_CHECK_SKIP);
}
my_error(ER_VIEW_CHECK_FAILED, MYF(0), main_view->view_db.str,
main_view->view_name.str);
return(VIEW_CHECK_ERROR);
} }
my_error(ER_VIEW_CHECK_FAILED, MYF(0), main_view->view_db.str,
main_view->view_name.str);
return(VIEW_CHECK_ERROR);
} }
return(VIEW_CHECK_OK); return(VIEW_CHECK_OK);
} }