diff options
| author | unknown <kostja@bodhi.(none)> | 2007-07-16 23:41:28 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-07-16 23:41:28 +0400 |
| commit | b94fb828472ad63bcde997cec1ddc83bd783428d (patch) | |
| tree | 182b287887217b74ee291b9e344358118e7e88f8 /sql/item.h | |
| parent | 7d3cecca0ae25abdc2943e79410a19bdde5fff54 (diff) | |
| parent | de2089264fcafa7f850c73382200ed1d5d91fdef (diff) | |
| download | mariadb-git-b94fb828472ad63bcde997cec1ddc83bd783428d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
mysql-test/t/sp.test:
Auto merged
sql/item.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/innodb_mysql.result:
Manual merge.
mysql-test/t/innodb_mysql.test:
Manual merge.
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sql/item.h b/sql/item.h index 26b39e0bd00..5b1a80a5f03 100644 --- a/sql/item.h +++ b/sql/item.h @@ -19,7 +19,7 @@ #endif class Protocol; -struct st_table_list; +struct TABLE_LIST; void item_init(void); /* Init item functions */ class Item_field; @@ -2315,14 +2315,6 @@ enum trg_action_time_type TRG_ACTION_BEFORE= 0, TRG_ACTION_AFTER= 1, TRG_ACTION_MAX }; -/* - Event on which trigger is invoked. -*/ -enum trg_event_type -{ - TRG_EVENT_INSERT= 0 , TRG_EVENT_UPDATE= 1, TRG_EVENT_DELETE= 2, TRG_EVENT_MAX -}; - class Table_triggers_list; /* |