sp_head-exec-include-name.diff

diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index c95761309a7..27d66d5a35c 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -1192,7 +1192,7 @@ void Sp_handler_procedure::recursion_level_error(THD *thd,
 */
 
 bool
-sp_head::execute(THD *thd, bool merge_da_on_success)
+sp_head::execute(THD *thd, bool merge_da_on_success, const char *sp_name)
 {
   DBUG_ENTER("sp_head::execute");
   char saved_cur_db_name_buf[SAFE_NAME_LEN+1];
@@ -1949,7 +1949,7 @@ sp_head::execute_trigger(THD *thd,
 
   thd->spcont= nctx;
 
-  MYSQL_RUN_SP(this, err_status= execute(thd, FALSE));
+  MYSQL_RUN_SP(this, err_status= execute(thd, FALSE, m_qname.str));
 
 err_with_cleanup:
   thd->restore_active_arena(&call_arena, &backup_arena);
@@ -2199,7 +2199,7 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount,
   */
   thd->set_n_backup_active_arena(call_arena, &backup_arena);
 
-  MYSQL_RUN_SP(this, err_status= execute(thd, TRUE));
+  MYSQL_RUN_SP(this, err_status= execute(thd, TRUE, m_qname.str));
 
   thd->restore_active_arena(call_arena, &backup_arena);
 
@@ -2482,7 +2482,7 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
   opt_trace_disable_if_no_stored_proc_func_access(thd, this);
 
   if (!err_status)
-    MYSQL_RUN_SP(this, err_status= execute(thd, TRUE));
+    MYSQL_RUN_SP(this, err_status= execute(thd, TRUE, m_qname.str));
 
   if (save_log_general)
     thd->variables.option_bits &= ~OPTION_LOG_OFF;
diff --git a/sql/sp_head.h b/sql/sp_head.h
index c0ed2b52edb..a3278d03d3a 100644
--- a/sql/sp_head.h
+++ b/sql/sp_head.h
@@ -954,7 +954,7 @@ class sp_head :private Query_arena,
   HASH m_sptabs;
 
   bool
-  execute(THD *thd, bool merge_da_on_success);
+  execute(THD *thd, bool merge_da_on_success, const char *spname);
 
   /**
     Perform a forward flow analysis in the generated code.