diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2017-09-14 22:22:21 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2017-09-14 22:22:21 +0200 |
| commit | efd9e5f7c600f39ac6a0a993d3812a35065183da (patch) | |
| tree | e6d2e8827ae45eee6c486e1549fc2ef2f061a9d1 /sql/sql_insert.cc | |
| parent | fa2701c6f7b028782cf231565f578b2fc0f10d51 (diff) | |
| download | mariadb-git-bb-10.1-MDEV-13290.tar.gz | |
MDEV-13290: Assertion Assertion `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())' or `! is_set()' failedbb-10.1-MDEV-13290
Check error status which can be set by conversion procedures.
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 721fff389e0..66837caf293 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1180,7 +1180,8 @@ values_loop_end: (!table->triggers || !table->triggers->has_delete_triggers())) table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE); - if (error) + /* We check thd->error() because it can be set by conversion problem. */ + if (error || thd->is_error()) goto abort; if (thd->lex->analyze_stmt) { |