Bug#34895 'show procedure status' or 'show function status' +

          'flush tables' crashes

The server crashes when 'show procedure status' and 'flush tables' are
run concurrently.

This is caused by the way mysql.proc table is added twice to the list
of table to lock although the requirements on the current locking API
assumes differently.

No test case is submitted because of the nature of the crash which is 
currently difficult to reproduce in a deterministic way.

This is a backport from 5.1

myisam/mi_dbug.c:
  * check_table_is_closed is only used in EXTRA_DEBUG mode but since it is
  iterating over myisam shared data it still needs to be protected by an
  appropriate mutex.
sql/sql_yacc.yy:
  * Since the I_S mechanism is already handling the open and close of 
  mysql.proc there is no need for the method sp_add_to_query_tables.

1 files changed, 6 insertions, 4 deletions

diff --git a/myisam/mi_dbug.c b/myisam/mi_dbug.c
index 07c314c43e6..111cae13344 100644
--- a/myisam/mi_dbug.c
+++ b/myisam/mi_dbug.c
@@ -171,7 +171,7 @@ my_bool check_table_is_closed(const char *name, const char *where)
   char filename[FN_REFLEN];
   LIST *pos;
   DBUG_ENTER("check_table_is_closed");
-
+  pthread_mutex_lock(&THR_LOCK_myisam);
   (void) fn_format(filename,name,"",MI_NAME_IEXT,4+16+32);
   for (pos=myisam_open_list ; pos ; pos=pos->next)
   {
@@ -181,12 +181,14 @@ my_bool check_table_is_closed(const char *name, const char *where)
     {
       if (share->last_version)
       {
-	fprintf(stderr,"Warning:  Table: %s is open on %s\n", name,where);
-	DBUG_PRINT("warning",("Table: %s is open on %s", name,where));
-	DBUG_RETURN(1);
+        fprintf(stderr,"Warning:  Table: %s is open on %s\n", name,where);
+        DBUG_PRINT("warning",("Table: %s is open on %s", name,where));
+        pthread_mutex_unlock(&THR_LOCK_myisam);
+        DBUG_RETURN(1);
       }
     }
   }
+  pthread_mutex_unlock(&THR_LOCK_myisam);
   DBUG_RETURN(0);
 }
 #endif /* EXTRA_DEBUG */