From: Marc Alff
Date: September 14 2010 9:51pm
Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3265)
List-Archive: http://lists.mysql.com/commits/118264
Message-Id: <20100914215208.0E01645E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2072157559909360557=="

--===============2072157559909360557==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-merge/ based on revid:marc.alff@stripped

 3265 Marc Alff	2010-09-14 [merge]
      MErge mysql-5.5-bugfixing --> mysql-trunk-bugfixing

    modified:
      mysql-test/valgrind.supp
      sql/mysqld.cc
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2010-06-07 09:14:56 +0000
+++ b/mysql-test/valgrind.supp	2010-09-14 21:51:35 +0000
@@ -745,3 +745,28 @@
    Memcheck:Addr1
    fun:buf_buddy_relocate
 }
+
+#
+# See related Bug#56666
+# Race condition between the server main thread and the kill server thread.
+#
+# Because of this race condition, the call to shutdown_performance_schema()
+# was commented in sql/mysqld.cc, causing the reported leaks.
+#
+
+{
+   missing shutdown_performance_schema 1
+   Memcheck:Leak
+   fun:malloc
+   fun:_Z10pfs_mallocmi
+}
+
+{
+   missing shutdown_performance_schema 2
+   Memcheck:Leak
+   fun:malloc
+   fun:my_malloc
+   fun:_lf_alloc_new
+   fun:lf_hash_insert
+}
+

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-09-08 07:09:13 +0000
+++ b/sql/mysqld.cc	2010-09-14 21:51:35 +0000
@@ -1395,6 +1395,12 @@ static void mysqld_exit(int exit_code)
   mysql_audit_finalize();
   clean_up_mutexes();
   clean_up_error_log_mutex();
+#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
+  /*
+    Bug#56666 needs to be fixed before calling:
+    shutdown_performance_schema();
+  */
+#endif
   my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
   exit(exit_code); /* purecov: inspected */
 }
@@ -2729,6 +2735,11 @@ pthread_handler_t signal_hand(void *arg
       if (!abort_loop)
       {
 	abort_loop=1;				// mark abort for threads
+#ifdef HAVE_PSI_INTERFACE
+        /* Delete the instrumentation for the signal thread */
+        if (likely(PSI_server != NULL))
+          PSI_server->delete_current_thread();
+#endif
 #ifdef USE_ONE_SIGNAL_HAND
 	pthread_t tmp;
         if (mysql_thread_create(0, /* Not instrumented */
@@ -4749,6 +4760,15 @@ int mysqld_main(int argc, char **argv)
 #endif
 #endif /* __WIN__ */
 
+#ifdef HAVE_PSI_INTERFACE
+  /*
+    Disable the main thread instrumentation,
+    to avoid recording events during the shutdown.
+  */
+  if (PSI_server)
+    PSI_server->delete_current_thread();
+#endif
+
   /* Wait until cleanup is done */
   mysql_mutex_lock(&LOCK_thread_count);
   while (!ready_to_exit)
@@ -4766,18 +4786,6 @@ int mysqld_main(int argc, char **argv)
   }
 #endif
   clean_up(1);
-#ifdef HAVE_PSI_INTERFACE
-  /*
-    Disable the instrumentation, to avoid recording events
-    during the shutdown.
-  */
-  if (PSI_server)
-  {
-    PSI_server->delete_current_thread();
-    PSI_server= NULL;
-  }
-  shutdown_performance_schema();
-#endif
   mysqld_exit(0);
 }
 


--===============2072157559909360557==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   merge/
# testament_sha1: 83817bdb2f51fe7c387638a0491d6f86712f5edf
# timestamp: 2010-09-14 15:52:07 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing/
# base_revision_id: marc.alff@stripped\
#   s5xg10ht7ul5832j
# 
# Begin bundle
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


--===============2072157559909360557==--