diff options
| author | unknown <mskold/marty@linux.site> | 2007-04-05 06:59:47 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2007-04-05 06:59:47 +0200 |
| commit | 33ad89917f1c0cb799f2c3a3fbfdc56c10bd2ce1 (patch) | |
| tree | f165cc5077e0d8115f6a1b801874106a1e01718c /sql/sql_trigger.h | |
| parent | 8bbbff63a34af79326e061f4b0b7b1080f34f0c4 (diff) | |
| parent | 22c188fef8b35279bdea0cbbbcd7804431901d03 (diff) | |
| download | mariadb-git-33ad89917f1c0cb799f2c3a3fbfdc56c10bd2ce1.tar.gz | |
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
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 bc4cafe026a..7d99dd811cd 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() { |