summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index df9d89b5aff..0dfa7ac6602 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -4277,7 +4277,10 @@ public:
{
DBUG_ENTER("clear_error");
if (get_stmt_da()->is_error() || clear_diagnostics)
+ {
get_stmt_da()->reset_diagnostics_area();
+ get_stmt_da()->reset_current_row_for_warning(0);
+ }
is_slave_error= 0;
if (killed == KILL_BAD_DATA)
reset_killed();