diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-01 15:23:18 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-01 15:23:18 +0200 |
| commit | ec40980ddd921a3a765c23cc430c9c219e48ea85 (patch) | |
| tree | 6553832d3d3fb4b2cb39aea6a1d69e54275f6eb2 /sql/sql_delete.cc | |
| parent | 6801f80aface011811d2978f86c03a25ca7b9165 (diff) | |
| parent | 9c72963d2aef783cae652b5b8ac01f7aa2bcb43a (diff) | |
| download | mariadb-git-ec40980ddd921a3a765c23cc430c9c219e48ea85.tar.gz | |
Merge 10.3 into 10.4
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 a965a7115d2..c4bc32262e8 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -945,7 +945,7 @@ cleanup: transactional_table, FALSE, FALSE, errcode); - if (log_result) + if (log_result > 0) { error=1; } @@ -1640,7 +1640,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 |