bk commit into 4.1 tree (reggie:1.2168) BUG#9665

[reggie]

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.2168 05/04/08 06:32:48 reggie@mdk10.(none) +1 -0
  Bug #9665  After registering MySQL service and starting with shared mem, cannot stop
  
  Removed the extra set of the shared memory connect event from kill_mysql since it is
also being set in kill_server

  sql/mysqld.cc
    1.569 05/04/08 06:32:40 reggie@mdk10.(none) +0 -9
    removed the code that set the shared memory connect event since this also being done
in kill_server

# 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.568/sql/mysqld.cc	2005-04-08 00:14:20 -05:00
+++ 1.569/sql/mysqld.cc	2005-04-08 06:32:40 -05:00
@@ -773,15 +773,6 @@
       CloseHandle(hEvent);
     */
   }
-#ifdef HAVE_SMEM
-    /*
-     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  
 #endif
 #elif defined(OS2)
   pthread_cond_signal( &eventShutdown);		// post semaphore