diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log_event.cc | 9 | ||||
| -rw-r--r-- | sql/sql_lex.cc | 23 | ||||
| -rw-r--r-- | sql/sql_trigger.cc | 6 | ||||
| -rw-r--r-- | sql/sql_trigger.h | 3 |
4 files changed, 16 insertions, 25 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 5fa2a7ac8d0..bbadda3167e 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -13470,9 +13470,8 @@ err: #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION) uint8 Write_rows_log_event::get_trg_event_map() { - return (static_cast<uint8> (1 << static_cast<int>(TRG_EVENT_INSERT)) | - static_cast<uint8> (1 << static_cast<int>(TRG_EVENT_UPDATE)) | - static_cast<uint8> (1 << static_cast<int>(TRG_EVENT_DELETE))); + return trg2bit(TRG_EVENT_INSERT) | trg2bit(TRG_EVENT_UPDATE) | + trg2bit(TRG_EVENT_DELETE); } #endif @@ -14179,7 +14178,7 @@ err: #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION) uint8 Delete_rows_log_event::get_trg_event_map() { - return static_cast<uint8> (1 << static_cast<int>(TRG_EVENT_DELETE)); + return trg2bit(TRG_EVENT_DELETE); } #endif @@ -14454,7 +14453,7 @@ err: #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION) uint8 Update_rows_log_event::get_trg_event_map() { - return static_cast<uint8> (1 << static_cast<int>(TRG_EVENT_UPDATE)); + return trg2bit(TRG_EVENT_UPDATE); } #endif diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 24de741cefd..8e31f479d68 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -3544,12 +3544,8 @@ void LEX::set_trg_event_type_for_tables() On a LOCK TABLE, all triggers must be pre-loaded for this TABLE_LIST when opening an associated TABLE. */ - new_trg_event_map= static_cast<uint8> - (1 << static_cast<int>(TRG_EVENT_INSERT)) | - static_cast<uint8> - (1 << static_cast<int>(TRG_EVENT_UPDATE)) | - static_cast<uint8> - (1 << static_cast<int>(TRG_EVENT_DELETE)); + new_trg_event_map= trg2bit(TRG_EVENT_INSERT) | trg2bit(TRG_EVENT_UPDATE) | + trg2bit(TRG_EVENT_DELETE); break; /* Basic INSERT. If there is an additional ON DUPLIATE KEY UPDATE @@ -3580,20 +3576,17 @@ void LEX::set_trg_event_type_for_tables() */ case SQLCOM_CREATE_TABLE: case SQLCOM_CREATE_SEQUENCE: - new_trg_event_map|= static_cast<uint8> - (1 << static_cast<int>(TRG_EVENT_INSERT)); + new_trg_event_map|= trg2bit(TRG_EVENT_INSERT); break; /* Basic update and multi-update */ case SQLCOM_UPDATE: /* fall through */ case SQLCOM_UPDATE_MULTI: - new_trg_event_map|= static_cast<uint8> - (1 << static_cast<int>(TRG_EVENT_UPDATE)); + new_trg_event_map|= trg2bit(TRG_EVENT_UPDATE); break; /* Basic delete and multi-delete */ case SQLCOM_DELETE: /* fall through */ case SQLCOM_DELETE_MULTI: - new_trg_event_map|= static_cast<uint8> - (1 << static_cast<int>(TRG_EVENT_DELETE)); + new_trg_event_map|= trg2bit(TRG_EVENT_DELETE); break; default: break; @@ -3601,12 +3594,10 @@ void LEX::set_trg_event_type_for_tables() switch (duplicates) { case DUP_UPDATE: - new_trg_event_map|= static_cast<uint8> - (1 << static_cast<int>(TRG_EVENT_UPDATE)); + new_trg_event_map|= trg2bit(TRG_EVENT_UPDATE); break; case DUP_REPLACE: - new_trg_event_map|= static_cast<uint8> - (1 << static_cast<int>(TRG_EVENT_DELETE)); + new_trg_event_map|= trg2bit(TRG_EVENT_DELETE); break; case DUP_ERROR: default: diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 33af220ae67..61660a964ff 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -2182,8 +2182,7 @@ bool Table_triggers_list::process_triggers(THD *thd, This trigger must have been processed by the pre-locking algorithm. */ - DBUG_ASSERT(trigger_table->pos_in_table_list->trg_event_map & - static_cast<uint>(1 << static_cast<int>(event))); + DBUG_ASSERT(trigger_table->pos_in_table_list->trg_event_map & trg2bit(event)); thd->reset_sub_statement_state(&statement_state, SUB_STMT_TRIGGER); @@ -2235,8 +2234,7 @@ add_tables_and_routines_for_triggers(THD *thd, for (int i= 0; i < (int)TRG_EVENT_MAX; i++) { - if (table_list->trg_event_map & - static_cast<uint8>(1 << static_cast<int>(i))) + if (table_list->trg_event_map & trg2bit(static_cast<trg_event_type>(i))) { for (int j= 0; j < (int)TRG_ACTION_MAX; j++) { diff --git a/sql/sql_trigger.h b/sql/sql_trigger.h index 0fddb94fde1..9cd6c61891a 100644 --- a/sql/sql_trigger.h +++ b/sql/sql_trigger.h @@ -38,6 +38,9 @@ enum trg_event_type TRG_EVENT_MAX }; +static inline uint8 trg2bit(enum trg_event_type trg) +{ return static_cast<uint8>(1 << static_cast<int>(trg)); } + #include "table.h" /* GRANT_INFO */ /* |