diff options
| author | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
|---|---|---|
| committer | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
| commit | 6db465d7ce455cf75ec224108cbe61ca8be63d3d (patch) | |
| tree | 9648ff1fc677eebb60b278c2e2c13131934ed2a0 /sql/sql_error.cc | |
| parent | ffe83e8e7bef32eb2a80aad2d382f0b023dd3a44 (diff) | |
| parent | 4a49f7f88cfa82ae6eb8e7b5a528e91416b33b52 (diff) | |
| download | mariadb-git-shagalla-10.4.tar.gz | |
Merge 10.3.7 into 10.4shagalla-10.4
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index 67440aeed33..d6f5b99eef6 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -337,7 +337,7 @@ Diagnostics_area::set_ok_status(ulonglong affected_rows, In production, refuse to overwrite an error or a custom response with an OK packet. */ - if (is_error() || is_disabled()) + if (unlikely(is_error() || is_disabled())) return; /* When running a bulk operation, m_status will be DA_OK for the first @@ -377,7 +377,7 @@ Diagnostics_area::set_eof_status(THD *thd) In production, refuse to overwrite an error or a custom response with an EOF packet. */ - if (is_error() || is_disabled()) + if (unlikely(is_error() || is_disabled())) return; /* |