Commit 22c188fe authored by unknown's avatar unknown
Browse files

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

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


sql/sql_trigger.h:
  Auto merged
parents 59a64c2b 4c0f3c50

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()

  {