Commit 33ad8991 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/sql_trigger.h:
  Auto merged
parents 8bbbff63 22c188fe

sql/sql_trigger.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ class Table_triggers_list: public Sql_alloc 
  bool has_triggers(trg_event_type event_type, 

                    trg_action_time_type action_time)

  {

    return (bodies[event_type][action_time]);

    return (bodies[event_type][action_time] != NULL);

  }

  bool has_delete_triggers()

  {