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
This commit is contained in:
commit
7dafa50a77
@ -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);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user