bzr commit into mysql-5.5.0-next-mr-bugfixing branch (vvaintroub:2900) Bug#48047

[Vladislav Vaintroub]

#At file:///H:/bzr/mysql-next-mr-bugfixing/ based on
revid:jperkin@stripped

 2900 Vladislav Vaintroub	2009-10-15
      Bug #48047 Can't do normal shutdown  
      
      Fix a regression that crept in when downporting Windows improvements.
      Instead of a shutdown thread, another thread that  handledsocket connection was
created.

    modified:
      sql/mysqld.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-09-30 20:10:22 +0000
+++ b/sql/mysqld.cc	2009-10-15 03:18:52 +0000
@@ -4112,8 +4112,7 @@ static void create_shutdown_thread()
 #ifdef __WIN__
   hEventShutdown=CreateEvent(0, FALSE, FALSE, shutdown_event_name);
   pthread_t hThread;
-  if (pthread_create(&hThread,&connection_attrib, 
-                     handle_connections_sockets_thread, 0))
+  if (pthread_create(&hThread,&connection_attrib,handle_shutdown,0))
     sql_print_warning("Can't create thread to handle shutdown requests");
 
   // On "Stop Service" we have to do regular shutdown


Attachment: [text/bzr-bundle] bzr/[e-mail]