diff options
| author | wax@kishkin.ru <> | 2004-11-23 17:55:07 +0500 |
|---|---|---|
| committer | wax@kishkin.ru <> | 2004-11-23 17:55:07 +0500 |
| commit | cfb82e9ef7c3c6654291bc27f42338f30af7af54 (patch) | |
| tree | 05020f0b15008956e118d55c4c6487380e22978e /sql/mysqld.cc | |
| parent | 4309d028095ce3111dde393b518ceb1fca1ac522 (diff) | |
| download | mariadb-git-cfb82e9ef7c3c6654291bc27f42338f30af7af54.tar.gz | |
rename event_connect_request to smem_event_connect_request
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 89b0a035e6c..ea4d52359f1 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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 @@ error: 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); |