diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-20 10:35:11 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-20 10:35:11 +0300 |
| commit | c9e111202efce8c61184d49062ec2e1d2d129a57 (patch) | |
| tree | 9668a752a6fb4cf07816ca2b24febab2e22d1108 /sql/table.cc | |
| parent | 78f6f2b73b42c7e94c5ef7dcef976cf35db0305c (diff) | |
| parent | 20d4cac6db5f34ef1bef156253fd87d8723899ae (diff) | |
| download | mariadb-git-c9e111202efce8c61184d49062ec2e1d2d129a57.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc index 3ab89897e07..68961fbecaa 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -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); } |