database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg20670-2

Browse Source 
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.
This commit is contained in:
unknown
2006-09-29 18:26:30 +04:00
parent e0d2f525fe 0e4dd85d67
commit 33e63d3b22
4 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_trigger.h
View File

@ -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);