post-merge changes, fixes, and tests

3 files changed, 5 insertions, 13 deletions

diff --git a/sql/item.h b/sql/item.h
index 458db5e0174..ac4fa866349 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -4103,11 +4103,7 @@ public:
     collation.set(item->collation);
     unsigned_flag= item->unsigned_flag;
     if (item->type() == FIELD_ITEM)
-    {
       cached_field= ((Item_field *)item)->field;
-      if (cached_field->table)
-        used_table_map= cached_field->table->map;
-    }
     return 0;
   };
   enum Type type() const { return CACHE_ITEM; }
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 9d1ba6c66fd..b3c33c2e46a 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3607,8 +3607,9 @@ static int init_common_variables()
     return 1;
   set_server_version();
 
-  sql_print_information("%s (mysqld %s) starting as process %lu ...",
-                        my_progname, server_version, (ulong) getpid());
+  if (!opt_help)
+    sql_print_information("%s (mysqld %s) starting as process %lu ...",
+                          my_progname, server_version, (ulong) getpid());
 
 #ifndef EMBEDDED_LIBRARY
   if (opt_abort && !opt_verbose)
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;