diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2020-09-17 18:55:59 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2020-09-22 17:04:08 +0530 |
| commit | 12dcdec221da70bbe355ad46b71f667c43061cdf (patch) | |
| tree | a8dca3390e7023ba8b4a8edd5d56fb939ca4fd47 /sql/sql_update.cc | |
| parent | 5768f57d243e3fa945d79fcdc1a3eacb1e4ebb0d (diff) | |
| download | mariadb-git-bb-10.1-MDEV-5628.tar.gz | |
MDEV-5628: Assertion `! is_set()' or `!is_set() || (m_status == DA_OK_BULK &&bb-10.1-MDEV-5628
is_bulk_op())' fails on UPDATE on a partitioned table with subquery
(MySQL:71630)
Analysis and fix: Error is not checked. So correct error state is not returned.
Fix: Check for error and return the error state.
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 9b2d24c3ba3..f44aaa2ea99 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -413,6 +413,8 @@ int mysql_update(THD *thd, query_plan.set_no_partitions(); if (thd->lex->describe || thd->lex->analyze_stmt) goto produce_explain_and_leave; + if (thd->is_error()) + DBUG_RETURN(1); my_ok(thd); // No matching records DBUG_RETURN(0); |