summaryrefslogtreecommitdiff
path: root/sql/sql_error.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-04-04 12:16:12 +0300
committerMonty <monty@mariadb.org>2018-05-07 00:07:32 +0300
commit30ebc3ee9efcab635b1f3e14b9198a58ae93c233 (patch)
tree81e3ad66cd4ec8693964317cbf23515d0e9ecf35 /sql/sql_error.cc
parenta22a339f8e044a1e8df011beb0b4c8f43792ac96 (diff)
downloadmariadb-git-30ebc3ee9efcab635b1f3e14b9198a58ae93c233.tar.gz
Add likely/unlikely to speed up execution
Added to: - if (error) - Lex - sql_yacc.yy and sql_yacc_ora.yy - In header files to alloc() calls - Added thd argument to thd_net_is_killed()
Diffstat (limited to 'sql/sql_error.cc')
-rw-r--r--sql/sql_error.cc4
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;
/*