diff options
author | unknown <dlenev@mockturtle.local> | 2006-09-29 18:26:30 +0400 |
---|---|---|
committer | unknown <dlenev@mockturtle.local> | 2006-09-29 18:26:30 +0400 |
commit | 33e63d3b22a85b023c0a33f93c3521708751cff9 (patch) | |
tree | 2225ad25c48e78031d4bdb2daa82c7b94a19f051 /sql/sql_trigger.h | |
parent | e0d2f525fe5ffc29e128713e7c4b5efd2ece9e91 (diff) | |
parent | 0e4dd85d67e740ddcf775ebfcebed3521b74b439 (diff) | |
download | mariadb-git-33e63d3b22a85b023c0a33f93c3521708751cff9.tar.gz |
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg20670-2
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg20670
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/key.cc:
Using 5.1 version of the code.
sql/mysql_priv.h:
Using 5.1 version of the code.
sql/opt_range.cc:
Using 5.1 version of the code.
sql/opt_range.h:
Using 5.1 version of the code.
sql/sql_update.cc:
Using 5.1 version of the code.
sql/sql_trigger.h:
Manual merge.
Diffstat (limited to 'sql/sql_trigger.h')
-rw-r--r-- | sql/sql_trigger.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/sql_trigger.h b/sql/sql_trigger.h index b2464745f7c..09576f5e523 100644 --- a/sql/sql_trigger.h +++ b/sql/sql_trigger.h @@ -116,11 +116,6 @@ public: bodies[TRG_EVENT_DELETE][TRG_ACTION_AFTER]); } - bool has_before_update_triggers() - { - return test(bodies[TRG_EVENT_UPDATE][TRG_ACTION_BEFORE]); - } - void set_table(TABLE *new_table); void mark_fields_used(trg_event_type event); |