diff options
| author | unknown <dlenev@mysql.com> | 2005-12-07 12:47:25 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-12-07 12:47:25 +0300 |
| commit | 24af7680d4fe70ecb359de6b435d76157efaf98a (patch) | |
| tree | 58da2b1b1437e48f3ad5b672bc3afd7d72d95e21 /sql/sql_trigger.h | |
| parent | f095abaa4748c5ad2c302b8697c819d3fbd5de2a (diff) | |
| parent | 361977c0daeac099e96ba83e341d4cdb36af7474 (diff) | |
| download | mariadb-git-24af7680d4fe70ecb359de6b435d76157efaf98a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_trigger.h:
Auto merged
sql/sp.cc:
Manual merge.
sql/sp.h:
Manual merge.
sql/sql_base.cc:
Manual merge.
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 143f9f4d5bd..51002683897 100644 --- a/sql/sql_trigger.h +++ b/sql/sql_trigger.h @@ -118,7 +118,7 @@ public: friend class Item_trigger_field; friend int sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex, - Table_triggers_list *triggers); + TABLE_LIST *table); private: bool prepare_record1_accessors(TABLE *table); |