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.

1 files changed, 5 insertions, 4 deletions

diff --git a/sql/sp.h b/sql/sp.h
index 235eb5cba37..53343e0fb25 100644
--- a/sql/sp.h
+++ b/sql/sp.h
@@ -84,12 +84,13 @@ void sp_add_used_routine(LEX *lex, Query_arena *arena,
                          sp_name *rt, char rt_type);
 void sp_remove_not_own_routines(LEX *lex);
 void sp_update_sp_used_routines(HASH *dst, HASH *src);
-int sp_cache_routines_and_add_tables(THD *thd, LEX *lex, 
-                                     bool first_no_prelock, bool *tabs_changed);
+int sp_cache_routines_and_add_tables(THD *thd, LEX *lex,
+                                     bool first_no_prelock,
+                                     bool *tabs_changed);
 int sp_cache_routines_and_add_tables_for_view(THD *thd, LEX *lex,
-                                              LEX *aux_lex);
+                                              TABLE_LIST *view);
 int sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex,
-                                         Table_triggers_list *triggers);
+                                                  TABLE_LIST *table);
 
 extern "C" byte* sp_sroutine_key(const byte *ptr, uint *plen, my_bool first);