diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-01-26 01:13:41 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-01-26 01:13:41 +0100 |
| commit | 9b76e2843b5bdb57c35ec99c506711af0645684d (patch) | |
| tree | 56bccb1bc8eb8aa441fd5683614c196e29b9c1ff /sql/sql_trigger.cc | |
| parent | 06a37d37a192fe13bc8a7148ae74fd9d154e4be4 (diff) | |
| parent | 3b1b665fcbe1b9ae7ee0d627105cfb69c9886179 (diff) | |
| download | mariadb-git-9b76e2843b5bdb57c35ec99c506711af0645684d.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 6 |
1 files changed, 2 insertions, 4 deletions
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++) { |