From c0638190759a616adc447207e18c155c81132ee9 Mon Sep 17 00:00:00 2001
From: "serg@serg.mylan" <>
Date: Fri, 23 Dec 2005 20:50:28 +0100
Subject: locking issues, test for LONGLONG_MIN in decimal.c

---
 mysys/thr_alarm.c | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'mysys/thr_alarm.c')

diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c
index e5b77de5e38..41914080a9d 100644
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -401,7 +401,7 @@ void end_thr_alarm(my_bool free_structures)
 {
   DBUG_ENTER("end_thr_alarm");
   if (alarm_aborted != 1)			/* If memory not freed */
-  {    
+  {
     pthread_mutex_lock(&LOCK_alarm);
     DBUG_PRINT("info",("Resheduling %d waiting alarms",alarm_queue.elements));
     alarm_aborted= -1;				/* mark aborted */
@@ -415,13 +415,10 @@ void end_thr_alarm(my_bool free_structures)
     if (free_structures)
     {
       struct timespec abstime;
-      /*
-	The following test is just for safety, the caller should not
-	depend on this
-      */
+
       DBUG_ASSERT(!alarm_queue.elements);
-      /* Wait until alarm thread dies */
 
+      /* Wait until alarm thread dies */
       set_timespec(abstime, 10);		/* Wait up to 10 seconds */
       while (alarm_thread_running)
       {
@@ -429,16 +426,13 @@ void end_thr_alarm(my_bool free_structures)
 	if (error == ETIME || error == ETIMEDOUT)
 	  break;				/* Don't wait forever */
       }
-      if (!alarm_queue.elements)
+      delete_queue(&alarm_queue);
+      alarm_aborted= 1;
+      pthread_mutex_unlock(&LOCK_alarm);
+      if (!alarm_thread_running)              /* Safety */
       {
-	delete_queue(&alarm_queue);
-	alarm_aborted= 1;
-	pthread_mutex_unlock(&LOCK_alarm);
-	if (!alarm_thread_running)		/* Safety */
-	{
-	  pthread_mutex_destroy(&LOCK_alarm);
-	  pthread_cond_destroy(&COND_alarm);
-	}
+        pthread_mutex_destroy(&LOCK_alarm);
+        pthread_cond_destroy(&COND_alarm);
       }
     }
     else
-- 
cgit v1.2.1