mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
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()
This commit is contained in:
@ -74,13 +74,13 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
|
||||
If reload_acl_and_cache() is called from SIGHUP handler we have to
|
||||
allocate temporary THD for execution of acl_reload()/grant_reload().
|
||||
*/
|
||||
if (!thd && (thd= (tmp_thd= new THD(0))))
|
||||
if (unlikely(!thd) && (thd= (tmp_thd= new THD(0))))
|
||||
{
|
||||
thd->thread_stack= (char*) &tmp_thd;
|
||||
thd->store_globals();
|
||||
}
|
||||
|
||||
if (thd)
|
||||
if (likely(thd))
|
||||
{
|
||||
bool reload_acl_failed= acl_reload(thd);
|
||||
bool reload_grants_failed= grant_reload(thd);
|
||||
@ -98,7 +98,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
|
||||
}
|
||||
opt_noacl= 0;
|
||||
|
||||
if (tmp_thd)
|
||||
if (unlikely(tmp_thd))
|
||||
{
|
||||
delete tmp_thd;
|
||||
thd= 0;
|
||||
@ -123,7 +123,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
|
||||
}
|
||||
|
||||
if (options & REFRESH_ERROR_LOG)
|
||||
if (flush_error_log())
|
||||
if (unlikely(flush_error_log()))
|
||||
{
|
||||
/*
|
||||
When flush_error_log() failed, my_error() has not been called.
|
||||
|
Reference in New Issue
Block a user