summaryrefslogtreecommitdiff
path: root/sql/temporary_tables.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/temporary_tables.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/temporary_tables.cc')
-rw-r--r--sql/temporary_tables.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/temporary_tables.cc b/sql/temporary_tables.cc
index 908d28f6629..54ce3b61f79 100644
--- a/sql/temporary_tables.cc
+++ b/sql/temporary_tables.cc
@@ -1398,7 +1398,8 @@ bool THD::log_events_and_free_tmp_shares()
get_stmt_da()->set_overwrite_status(true);
transaction.stmt.mark_dropped_temp_table();
- if ((error= (mysql_bin_log.write(&qinfo) || error)))
+ bool error2= mysql_bin_log.write(&qinfo);
+ if (unlikely(error|= error2))
{
/*
If we're here following THD::cleanup, thence the connection