cleanup: remove dead (half-merged) code

2 files changed, 0 insertions, 35 deletions

diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index 7a61279fc9c..a6aa91529bb 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -2239,37 +2239,6 @@ add_tables_and_routines_for_triggers(THD *thd,
 
 
 /**
-  Check if any of the marked fields are used in the trigger.
-
-  @param used_fields  Bitmap over fields to check
-  @param event_type   Type of event triggers for which we are going to inspect
-  @param action_time  Type of trigger action time we are going to inspect
-*/
-
-bool Table_triggers_list::is_fields_updated_in_trigger(MY_BITMAP *used_fields,
-                                                       trg_event_type event_type,
-                                                       trg_action_time_type action_time)
-{
-  Item_trigger_field *trg_field;
-  sp_head *sp= bodies[event_type][action_time];
-  DBUG_ASSERT(used_fields->n_bits == trigger_table->s->fields);
-
-  for (trg_field= sp->m_trg_table_fields.first; trg_field;
-       trg_field= trg_field->next_trg_field)
-  {
-    /* We cannot check fields which does not present in table. */
-    if (trg_field->field_idx != (uint)-1)
-    {
-      if (bitmap_is_set(used_fields, trg_field->field_idx) &&
-          trg_field->get_settable_routine_parameter())
-        return true;
-    }
-  }
-  return false;
-}
-
-
-/**
   Mark fields of subject table which we read/set in its triggers
   as such.
 
diff --git a/sql/sql_trigger.h b/sql/sql_trigger.h
index fa858a0582b..be6d8e4117a 100644
--- a/sql/sql_trigger.h
+++ b/sql/sql_trigger.h
@@ -215,10 +215,6 @@ public:
                                             Query_tables_list *prelocking_ctx,
                                             TABLE_LIST *table_list);
 
-  bool is_fields_updated_in_trigger(MY_BITMAP *used_fields,
-                                    trg_event_type event_type,
-                                    trg_action_time_type action_time);
-
   Field **nullable_fields() { return record0_field; }
   void reset_extra_null_bitmap()
   {