diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2017-09-19 15:55:59 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2017-09-19 16:19:06 +0200 |
| commit | 97c2a7354b68b4476ef77266c21b02bf72c53cdf (patch) | |
| tree | 03fcc2b771808f8da6269ad0b098019d9f4ee824 /sql | |
| parent | 389f7cdf3ccd11a6b4fb9b6346436790254e615c (diff) | |
| download | mariadb-git-97c2a7354b68b4476ef77266c21b02bf72c53cdf.tar.gz | |
MDEV-13290: Assertion Assertion `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())' or `! is_set()' failed
Check error status which can be set by conversion procedures.
Diffstat (limited to 'sql')
| -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 975d9d53882..ff9c4217b7d 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -4642,6 +4642,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); } |