diff options
| author | unknown <pem@mysql.com> | 2005-12-06 13:34:18 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2005-12-06 13:34:18 +0100 |
| commit | 47fe447536b84908e176db62ef821afee0f923ff (patch) | |
| tree | 22e589d866e2e6c9864012307d0df61496105a96 /sql/sql_trigger.h | |
| parent | b04f21b571ebe197029614309cd1d1c11ff0e85d (diff) | |
| parent | d4088df5e9a02e714d85f79bec3ea97cdd8128c6 (diff) | |
| download | mariadb-git-47fe447536b84908e176db62ef821afee0f923ff.tar.gz | |
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/usr/home/pem/bug14233/mysql-5.0
mysql-test/r/sp-error.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/sp.cc:
Auto merged
sql/sp.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_trigger.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
SCCS 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 6be42d7b868..143f9f4d5bd 100644 --- a/sql/sql_trigger.h +++ b/sql/sql_trigger.h @@ -117,7 +117,7 @@ public: void set_table(TABLE *new_table); friend class Item_trigger_field; - friend void sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex, + friend int sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex, Table_triggers_list *triggers); private: |