post-merge changes, fixes, and tests

1 files changed, 2 insertions, 7 deletions

diff --git a/sql/sp.cc b/sql/sp.cc
index 873812c19b3..254c9c5a101 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -1495,13 +1495,8 @@ bool lock_db_routines(THD *thd, char *db)
     {
       char *sp_name= get_field(thd->mem_root,
                                table->field[MYSQL_PROC_FIELD_NAME]);
-      if (sp_name == NULL)
-      {
-        table->file->ha_index_end();
-        my_error(ER_SP_WRONG_NAME, MYF(0), "");
-        close_system_tables(thd, &open_tables_state_backup);
-        DBUG_RETURN(true);
-      }
+      if (sp_name == NULL) // skip invalid sp names (hand-edited mysql.proc?)
+        continue;
 
       longlong sp_type= table->field[MYSQL_PROC_MYSQL_TYPE]->val_int();
       MDL_request *mdl_request= new (thd->mem_root) MDL_request;