diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2020-09-17 19:03:02 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2020-09-22 17:12:57 +0530 |
| commit | 1060cc4235a5f5b9e5f5fc040e3373819f115b04 (patch) | |
| tree | 2dfc9cb7f70a4c92b46e1eee7fd7ccd3629bf80a /sql/sql_update.cc | |
| parent | 80075ba011fb1b90aaf349a17a6f94145c5c8864 (diff) | |
| download | mariadb-git-bb-10.2-MDEV-23500.tar.gz | |
MDEV-23500: Assertion `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())'bb-10.2-MDEV-23500
failed in Diagnostics_area::set_ok_status upon multi-table update
Analysis: When NULL field is copied to NOT-NULL so there is error but
this error is not reported so we get the failure.
Fix: 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 2e9752eeabd..660067da8d6 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -2466,6 +2466,8 @@ int multi_update::do_updates() copy_field_ptr++) { (*copy_field_ptr->do_copy)(copy_field_ptr); + if (thd->is_error()) + goto err2; copy_field_ptr->to_field->set_has_explicit_value(); } |