summaryrefslogtreecommitdiff
path: root/sql/partition_info.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/partition_info.cc')
-rw-r--r--sql/partition_info.cc15
1 files changed, 2 insertions, 13 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index 9d31667a6a8..273c0afb9ac 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -330,11 +330,7 @@ bool partition_info::can_prune_insert(THD* thd,
partitioning column, since they may change the row to be in another
partition.
*/
- if (table->triggers &&
- table->triggers->has_triggers(TRG_EVENT_INSERT, TRG_ACTION_BEFORE) &&
- table->triggers->is_fields_updated_in_trigger(&full_part_field_set,
- TRG_EVENT_INSERT,
- TRG_ACTION_BEFORE))
+ if (is_fields_updated_in_triggers(TRG_EVENT_INSERT, TRG_ACTION_BEFORE))
DBUG_RETURN(false);
if (table->found_next_number_field)
@@ -371,15 +367,8 @@ bool partition_info::can_prune_insert(THD* thd,
partitioning column, since they may change the row to be in another
partition.
*/
- if (table->triggers &&
- table->triggers->has_triggers(TRG_EVENT_UPDATE,
- TRG_ACTION_BEFORE) &&
- table->triggers->is_fields_updated_in_trigger(&full_part_field_set,
- TRG_EVENT_UPDATE,
- TRG_ACTION_BEFORE))
- {
+ if (is_fields_updated_in_triggers(TRG_EVENT_UPDATE, TRG_ACTION_BEFORE))
DBUG_RETURN(false);
- }
}
/*