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

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-09-20 10:35:11 +03:00
parent 78f6f2b73b 20d4cac6db
commit c9e111202e
3 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/table.cc
View File

@ -4730,6 +4730,9 @@ int TABLE_LIST::view_check_option(THD *thd, bool ignore_failure)
main_view->view_name.str);
return(VIEW_CHECK_ERROR);
}
/* We check thd->error() because it can be set by conversion problem. */
if (thd->is_error())
return(VIEW_CHECK_ERROR);
return(VIEW_CHECK_OK);
}