summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r--sql/sql_insert.cc3
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)
{