Commit 7dafa50a authored by unknown's avatar unknown

Merge pilot.(none):/data/msvensson/mysql/bug29133/my51-bug29133

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


sql/mysqld.cc:
  Auto merged
parents a97c05e0 865ac1a2
...@@ -762,6 +762,7 @@ static void close_connections(void) ...@@ -762,6 +762,7 @@ static void close_connections(void)
DBUG_PRINT("info",("Waiting for select thread")); DBUG_PRINT("info",("Waiting for select thread"));
#ifndef DONT_USE_THR_ALARM #ifndef DONT_USE_THR_ALARM
if (pthread_kill(select_thread, thr_client_alarm))
break; // allready dead break; // allready dead
#endif #endif
set_timespec(abstime, 2); set_timespec(abstime, 2);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment