summaryrefslogtreecommitdiff
path: root/sql/events.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/events.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/events.cc')
-rw-r--r--sql/events.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/events.cc b/sql/events.cc
index 2fbb16861f6..6a8695843a3 100644
--- a/sql/events.cc
+++ b/sql/events.cc
@@ -320,7 +320,7 @@ Events::create_event(THD *thd, Event_parse_data *parse_data)
enum_binlog_format save_binlog_format;
DBUG_ENTER("Events::create_event");
- if (check_if_system_tables_error())
+ if (unlikely(check_if_system_tables_error()))
DBUG_RETURN(TRUE);
/*
@@ -455,7 +455,7 @@ Events::update_event(THD *thd, Event_parse_data *parse_data,
DBUG_ENTER("Events::update_event");
- if (check_if_system_tables_error())
+ if (unlikely(check_if_system_tables_error()))
DBUG_RETURN(TRUE);
if (parse_data->check_parse_data(thd) || parse_data->do_not_create)
@@ -589,7 +589,7 @@ Events::drop_event(THD *thd, const LEX_CSTRING *dbname,
enum_binlog_format save_binlog_format;
DBUG_ENTER("Events::drop_event");
- if (check_if_system_tables_error())
+ if (unlikely(check_if_system_tables_error()))
DBUG_RETURN(TRUE);
if (check_access(thd, EVENT_ACL, dbname->str, NULL, NULL, 0, 0))
@@ -761,7 +761,7 @@ Events::show_create_event(THD *thd, const LEX_CSTRING *dbname,
DBUG_ENTER("Events::show_create_event");
DBUG_PRINT("enter", ("name: %s@%s", dbname->str, name->str));
- if (check_if_system_tables_error())
+ if (unlikely(check_if_system_tables_error()))
DBUG_RETURN(TRUE);
if (check_access(thd, EVENT_ACL, dbname->str, NULL, NULL, 0, 0))
@@ -817,7 +817,7 @@ Events::fill_schema_events(THD *thd, TABLE_LIST *tables, COND * /* cond */)
if (opt_noacl)
DBUG_RETURN(0);
- if (check_if_system_tables_error())
+ if (unlikely(check_if_system_tables_error()))
DBUG_RETURN(1);
/*