Commit 22c188fe authored by unknown's avatar unknown

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
...@@ -113,7 +113,7 @@ class Table_triggers_list: public Sql_alloc ...@@ -113,7 +113,7 @@ class Table_triggers_list: public Sql_alloc
bool has_triggers(trg_event_type event_type, bool has_triggers(trg_event_type event_type,
trg_action_time_type action_time) trg_action_time_type action_time)
{ {
return (bodies[event_type][action_time]); return (bodies[event_type][action_time] != NULL);
} }
bool has_delete_triggers() bool has_delete_triggers()
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment