merge

mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_rcontext.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 2 insertions, 6 deletions

diff --git a/sql/sp.h b/sql/sp.h
index 783de2fe7ee..acdfe824b97 100644
--- a/sql/sp.h
+++ b/sql/sp.h
@@ -44,9 +44,7 @@ sp_drop_procedure(THD *thd, sp_name *name);
 
 
 int
-sp_update_procedure(THD *thd, sp_name *name,
-		    char *newname, uint newnamelen,
-		    st_sp_chistics *chistics);
+sp_update_procedure(THD *thd, sp_name *name, st_sp_chistics *chistics);
 
 int
 sp_show_create_procedure(THD *thd, sp_name *name);
@@ -64,9 +62,7 @@ int
 sp_drop_function(THD *thd, sp_name *name);
 
 int
-sp_update_function(THD *thd, sp_name *name,
-		   char *newname, uint newnamelen,
-		   st_sp_chistics *chistics);
+sp_update_function(THD *thd, sp_name *name, st_sp_chistics *chistics);
 
 int
 sp_show_create_function(THD *thd, sp_name *name);