diff options
| author | Alexander Barkov <bar@mysql.com> | 2010-02-17 12:24:47 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2010-02-17 12:24:47 +0400 |
| commit | 8780277b83f06c64922120f89c6e25b490c463cb (patch) | |
| tree | 470d806f908f42a4eaf28d397f33be1e76b383a3 /sql/sql_trigger.h | |
| parent | cf718fe9b77e97e641bddbb1438ed5d60c455e2e (diff) | |
| parent | ab293e26c385d3dfc1b51923b50fd5f2ac158ee0 (diff) | |
| download | mariadb-git-8780277b83f06c64922120f89c6e25b490c463cb.tar.gz | |
Merging from mysql-next-mr
Diffstat (limited to 'sql/sql_trigger.h')
| -rw-r--r-- | sql/sql_trigger.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_trigger.h b/sql/sql_trigger.h index b411acf2ac5..85b2dbe5f21 100644 --- a/sql/sql_trigger.h +++ b/sql/sql_trigger.h @@ -144,8 +144,10 @@ public: void mark_fields_used(trg_event_type event); friend class Item_trigger_field; - friend int sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex, - TABLE_LIST *table); + + bool add_tables_and_routines_for_triggers(THD *thd, + Query_tables_list *prelocking_ctx, + TABLE_LIST *table_list); private: bool prepare_record1_accessors(TABLE *table); |