diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2020-09-17 18:55:59 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2020-10-20 12:12:12 +0530 |
| commit | 9fca6645f42a6322215de51d97c9237f4a28a2d1 (patch) | |
| tree | 160dd21999c4bb71b6459879b9a2d57586af82c0 /sql | |
| parent | d36cd5f01ec322c4cdf2feda288c3932260c5c57 (diff) | |
| download | mariadb-git-9fca6645f42a6322215de51d97c9237f4a28a2d1.tar.gz | |
MDEV-5628: Assertion `! is_set()' or `!is_set() || (m_status == DA_OK_BULK &&
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')
| -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); |