From: Marc Alff
Date: September 14 2010 9:42pm
Subject: bzr push into mysql-5.5-bugfixing branch (marc.alff:3205)
List-Archive: http://lists.mysql.com/commits/118261
Message-Id: <20100914214214.A33B145E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8778992550842825364=="

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

 3205 Marc Alff	2010-09-14 [merge]
      Local merge

    modified:
      client/mysqltest.cc
      libmysqld/lib_sql.cc
      mysql-test/include/default_mysqld.cnf
      mysql-test/r/func_time.result
      mysql-test/r/parser.result
      mysql-test/r/select.result
      mysql-test/r/strict.result
      mysql-test/r/type_datetime.result
      mysql-test/suite/perfschema/include/upgrade_check.inc
      mysql-test/suite/perfschema/r/start_server_no_cond_class.result
      mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
      mysql-test/suite/perfschema/r/start_server_no_file_class.result
      mysql-test/suite/perfschema/r/start_server_no_file_inst.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
      mysql-test/suite/perfschema/r/start_server_no_thread_class.result
      mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
      mysql-test/suite/perfschema/r/start_server_off.result
      mysql-test/suite/perfschema/r/start_server_on.result
      mysql-test/t/strict.test
      mysql-test/t/type_datetime.test
      mysys/my_gethwaddr.c
      mysys/my_sync.c
      sql/derror.cc
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/mysqld.cc
      sql/set_var.cc
      sql/set_var.h
      sql/sys_vars.h
      storage/perfschema/ha_perfschema.cc
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2010-06-07 08:47:04 +0000
+++ b/mysql-test/valgrind.supp	2010-09-09 21:33: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-02 18:37:04 +0000
+++ b/sql/mysqld.cc	2010-09-14 21:40:50 +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 */
 }
@@ -2733,6 +2739,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 */
@@ -4588,6 +4599,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)
@@ -4605,18 +4625,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);
 }
 


--===============8778992550842825364==
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-5.5-bugfixing-\
#   56324-B/
# testament_sha1: 6dbb85cc53013482d9c86e88817b1346681412ba
# timestamp: 2010-09-14 15:42:14 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing/
# base_revision_id: marc.alff@stripped\
#   0pw0qzqgbw30e2w0
# 
# Begin bundle
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


--===============8778992550842825364==--