Manual fixes after merging patch for bug #8406 "Triggers crash if referencing

a table" with main tree.


mysql-test/r/trigger.result:
  Temporalily disable part of test which exposes bug #11554 (work on which is in
  progress).
mysql-test/t/sp-error.test:
  After merge fix.
    Fixed wrong delimiter command.
mysql-test/t/trigger.test:
  Temporalily disable part of test which exposes bug #11554 (work on which is in
  progress).
sql/sp.cc:
  After merge fix.
    Item_arena was renamed to Query_arena.
sql/sp.h:
  After merge fix.
    Item_arena was renamed to Query_arena.
sql/sql_lex.cc:
  After merge fix.
    LEX::spfuns/spprocs hashes were replaces with one LEX::sroutines hash.

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/sp.h b/sql/sp.h
index 1854cee00f9..172559a706f 100644
--- a/sql/sp.h
+++ b/sql/sp.h
@@ -82,7 +82,7 @@ sp_function_exists(THD *thd, sp_name *name);
   Procedures for pre-caching of stored routines and building table list
   for prelocking.
 */
-void sp_add_used_routine(LEX *lex, Item_arena *arena,
+void sp_add_used_routine(LEX *lex, Query_arena *arena,
                          sp_name *rt, char rt_type);
 void sp_update_sp_used_routines(HASH *dst, HASH *src);
 bool sp_cache_routines_and_add_tables(THD *thd, LEX *lex);