diff options
| author | unknown <mskold/marty@linux.site> | 2007-04-05 06:52:25 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2007-04-05 06:52:25 +0200 |
| commit | 22c188fef8b35279bdea0cbbbcd7804431901d03 (patch) | |
| tree | 5245b4356cd14134d80bba334eabb0a5abfabf8d /sql/sql_trigger.h | |
| parent | 59a64c2b1604649be464d38141e2345c79d27bd3 (diff) | |
| parent | 4c0f3c50f80d325563380f83a6a6e620d71a359b (diff) | |
| download | mariadb-git-22c188fef8b35279bdea0cbbbcd7804431901d03.tar.gz | |
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
Diffstat (limited to 'sql/sql_trigger.h')
| -rw-r--r-- | sql/sql_trigger.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_trigger.h b/sql/sql_trigger.h index 2be42cbccac..44d87a10510 100644 --- 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() { |