summaryrefslogtreecommitdiff
path: root/sql/tztime.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/tztime.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/tztime.cc')
-rw-r--r--sql/tztime.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc
index 277709ad9e9..61fbee1731a 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -1768,7 +1768,8 @@ end_with_setting_default_tz:
most of them once more, but this is OK for system tables open
for READ.
*/
- if (!(global_system_variables.time_zone= my_tz_find(thd, &tmp_tzname2)))
+ if (unlikely(!(global_system_variables.time_zone=
+ my_tz_find(thd, &tmp_tzname2))))
{
sql_print_error("Fatal error: Illegal or unknown default time zone '%s'",
default_tzname);
@@ -1783,7 +1784,7 @@ end_with_close:
end_with_cleanup:
/* if there were error free time zone describing structs */
- if (return_val)
+ if (unlikely(return_val))
my_tz_free();
end:
delete thd;