Commit 14769b68 authored by unknown's avatar unknown
Browse files

rename event_connect_request to smem_event_connect_request

parent e82f2c93

sql/mysqld.cc

+7 −7
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ Query_cache query_cache; 
#ifdef HAVE_SMEM

char *shared_memory_base_name= default_shared_memory_base_name;

bool opt_enable_shared_memory;

HANDLE event_connect_request= 0;

HANDLE smem_event_connect_request= 0;

#endif



#include "sslopt-vars.h"
@@ -746,11 +746,11 @@ void kill_mysql(void) 
  }

#ifdef HAVE_SMEM

    /*

     Send event to event_connect_request for aborting

     Send event to smem_event_connect_request for aborting

    */

    if (!SetEvent(event_connect_request))

    if (!SetEvent(smem_event_connect_request))

    {

      DBUG_PRINT("error",("Got error: %ld from SetEvent of event_connect_request",GetLastError()));

      DBUG_PRINT("error",("Got error: %ld from SetEvent of smem_event_connect_request",GetLastError()));

    }

#endif  

#endif
@@ -3737,7 +3737,7 @@ pthread_handler_decl(handle_connections_shared_memory,arg) 
  */

  suffix_pos= strxmov(tmp,shared_memory_base_name,"_",NullS);

  strmov(suffix_pos, "CONNECT_REQUEST");

  if ((event_connect_request= CreateEvent(0,FALSE,FALSE,tmp)) == 0)

  if ((smem_event_connect_request= CreateEvent(0,FALSE,FALSE,tmp)) == 0)

  {

    errmsg= "Could not create request event";

    goto error;
@@ -3768,7 +3768,7 @@ pthread_handler_decl(handle_connections_shared_memory,arg) 
  while (!abort_loop)

  {

    /* Wait a request from client */

    WaitForSingleObject(event_connect_request,INFINITE);

    WaitForSingleObject(smem_event_connect_request,INFINITE);



    /*

       it can be after shutdown command
@@ -3899,7 +3899,7 @@ pthread_handler_decl(handle_connections_shared_memory,arg) 
  if (handle_connect_map)	UnmapViewOfFile(handle_connect_map);

  if (handle_connect_file_map)	CloseHandle(handle_connect_file_map);

  if (event_connect_answer)	CloseHandle(event_connect_answer);

  if (event_connect_request)	CloseHandle(event_connect_request);

  if (smem_event_connect_request) CloseHandle(smem_event_connect_request);



  decrement_handler_count();

  DBUG_RETURN(0);