diff options
| author | unknown <lars/lthalmann@dl145k.mysql.com> | 2007-03-01 15:39:57 +0100 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145k.mysql.com> | 2007-03-01 15:39:57 +0100 |
| commit | e95a62a737dba410a1e9fb23ad8d979a04d3d1ac (patch) | |
| tree | e6fedee764a1d5b99111226685f214438f5827a6 /sql/sql_trigger.cc | |
| parent | 683c1e6ad7ace035891c0f5fbd31c2ad0820f6ad (diff) | |
| parent | 92e7cf15591bbb8508ae4f57962591d9c0072b85 (diff) | |
| download | mariadb-git-e95a62a737dba410a1e9fb23ad8d979a04d3d1ac.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
mysql-test/r/mysqlbinlog.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_trigger.h:
Auto merged
sql/slave.cc:
Manual merge
sql/sql_insert.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
sql/sql_yacc.yy:
Manual merge
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index df363c3c21c..5c61f172ecd 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -106,10 +106,6 @@ const LEX_STRING trg_event_type_names[]= }; -static int -add_table_for_trigger(THD *thd, sp_name *trig, bool if_exists, - TABLE_LIST ** table); - class Handle_old_incorrect_sql_modes_hook: public Unknown_key_hook { private: @@ -1180,7 +1176,7 @@ bool Table_triggers_list::get_trigger_info(THD *thd, trg_event_type event, 1 Error */ -static int +int add_table_for_trigger(THD *thd, sp_name *trig, bool if_exists, TABLE_LIST **table) { |