From: Date: April 8 2005 7:18am
Subject: bk commit into 4.1 tree (reggie:1.2166) BUG#9665
List-Archive: http://lists.mysql.com/internals/23808
X-Bug: 9665
Message-Id: <200504080518.j385IEd9023452@mdk10>

Below is the list of changes that have just been committed into a local
4.1 repository of reggie. When reggie 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
  1.2166 05/04/08 00:16:02 reggie@mdk10.(none) +1 -0
  Bug #9665 After registering MySQL service and starting with shared mem, cannot stop 
  
  The shared memory connect event was not being set in kill_server.
  This caused the thread that is handling shared memory connections to never
  exit.

  sql/mysqld.cc
    1.568 05/04/08 00:14:20 reggie@mdk10.(none) +12 -0
    Added code to set the shared memory connect event upon server termination

# 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:	reggie
# Host:	mdk10.(none)
# Root:	/home/reggie/bk/mysql-4.1

--- 1.567/sql/mysqld.cc	2005-04-05 02:06:55 -05:00
+++ 1.568/sql/mysqld.cc	2005-04-08 00:14:20 -05:00
@@ -835,6 +835,18 @@
   else
     sql_print_error(ER(ER_GOT_SIGNAL),my_progname,sig); /* purecov: inspected */
 
+#if defined(HAVE_SMEM) && defined(__WIN__)    
+  /*    
+   Send event to smem_event_connect_request for aborting    
+   */    
+  if (!SetEvent(smem_event_connect_request))    
+  {      
+	  DBUG_PRINT("error",
+		("Got error: %ld from SetEvent of smem_event_connect_request",
+		 GetLastError()));    
+  }
+#endif  
+  
 #if defined(__NETWARE__) || (defined(USE_ONE_SIGNAL_HAND) && !defined(__WIN__) && !defined(OS2))
   my_thread_init();				// If this is a new thread
 #endif