database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
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.
This commit is contained in:
unknown
2005-12-07 12:47:25 +03:00
parent f095abaa47 361977c0da
commit 24af7680d4
10 changed files with 176 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_trigger.h
View File

@ -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);