diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-11-05 16:15:20 +0100 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-07 08:52:30 +0100 |
| commit | 3ad37ed0eb343cd173b103974aded5783958a88e (patch) | |
| tree | f4ff854553d26a9e7d57791e7d671d4349a58d2d /sql/sql_delete.cc | |
| parent | 46f2f24ec43e9c1fa2d994afd615f58736c00d65 (diff) | |
| parent | 0339cbe2f628f8a122ba7ea3a75fc99fa1dc4c96 (diff) | |
| download | mariadb-git-3ad37ed0eb343cd173b103974aded5783958a88e.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 8161a761486..0ea00a7d61c 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -930,7 +930,7 @@ cleanup: transactional_table, FALSE, FALSE, errcode); - if (log_result) + if (log_result > 0) { error=1; } @@ -1616,7 +1616,7 @@ bool multi_delete::send_eof() if (unlikely(thd->binlog_query(THD::ROW_QUERY_TYPE, thd->query(), thd->query_length(), transactional_tables, FALSE, FALSE, - errcode)) && + errcode) > 0) && !normal_tables) { local_error=1; // Log write failed: roll back the SQL statement |