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

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

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2e7255ae · mskold/marty@linux.site · 6c8f5c58 · 84eb172c · 2e7255ae
Commit 2e7255ae authored Apr 05, 2007 by mskold/marty@linux.site
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_trigger.h sql/sql_trigger.h +1 -1

No files found.
--- a/sql/sql_trigger.h
+++ b/sql/sql_trigger.h
@@ -113,7 +113,7 @@ public:
  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()
  {