List:Commits« Previous MessageNext Message »
From:rsomla Date:November 22 2006 4:31pm
Subject:bk commit into 5.0 tree (rafal:1.2309) BUG#24387
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of rafal. When rafal does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-22 17:31:42+01:00, rafal@quant.(none) +2 -0
  This is implementation of points 1 and 2 of the temporary solution 
  suggested by Monty. See bug#24387 report.

  mysql-test/valgrind.supp@stripped, 2006-11-22 17:31:39+01:00, rafal@quant.(none) +49 -0
    Four valgrind stacks to be suppressed in 5.0 tree until some general
    improvements in thread shutdown code are implemented.

  sql/mysqld.cc@stripped, 2006-11-22 17:31:39+01:00, rafal@quant.(none) +1 -0
    Match a call to my_thread_init(). Just safety as kill_server() should 
    not return in most cases.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	rafal
# Host:	quant.(none)
# Root:	/ext/mysql/bk/mysql-5.0-rpl-bug24387

--- 1.578/sql/mysqld.cc	2006-11-22 17:31:49 +01:00
+++ 1.579/sql/mysqld.cc	2006-11-22 17:31:49 +01:00
@@ -2468,6 +2468,7 @@
   if (WaitForSingleObject(hEventShutdown,INFINITE)==WAIT_OBJECT_0)
 #endif /* EMBEDDED_LIBRARY */
      kill_server(MYSQL_KILL_SIGNAL);
+  my_thread_end();
   return 0;
 }
 

--- 1.7/mysql-test/valgrind.supp	2006-11-22 17:31:49 +01:00
+++ 1.8/mysql-test/valgrind.supp	2006-11-22 17:31:49 +01:00
@@ -346,3 +346,52 @@
    fun:_ZN19TransporterRegistry11performSendEv
    fun:_ZN19TransporterRegistry14forceSendCheckEi
 }
+
+#
+# BUG#24387: Suppressions approved by Monty until general thread shutdown
+# code improvements are implemented.
+#
+
+{
+   bug#24387 stack 1
+   Memcheck:Leak
+   fun:calloc
+   fun:my_thread_init
+   fun:handle_one_connection
+   fun:start_thread
+   fun:clone
+}
+
+{
+   bug#24387 stack 2
+   Memcheck:Leak
+   fun:calloc
+   fun:my_thread_init
+   fun:handle_slave_sql
+   fun:start_thread
+   fun:clone
+}
+
+{
+   bug#24387 stack 3
+   Memcheck:Leak
+   fun:calloc
+   fun:my_thread_init
+   fun:handle_slave_io
+   fun:start_thread
+   fun:clone
+}
+
+{
+   bug#24387 stack 4
+   Memcheck:Leak
+   fun:malloc
+   fun:DbugMalloc
+   fun:_db_enter_
+   fun:kill_server
+   fun:kill_server_thread
+   fun:start_thread
+   fun:clone
+}
+
+
Thread
bk commit into 5.0 tree (rafal:1.2309) BUG#24387rsomla22 Nov