From 97c2a7354b68b4476ef77266c21b02bf72c53cdf Mon Sep 17 00:00:00 2001
From: Oleksandr Byelkin <sanja@mariadb.com>
Date: Tue, 19 Sep 2017 15:55:59 +0200
Subject: 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.
---
 sql/table.cc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sql/table.cc')

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);
 }
 
-- 
cgit v1.2.1