From cf933534eac84b998de0853ff809f828405b7e00 Mon Sep 17 00:00:00 2001
From: unknown <joerg@trift2.>
Date: Tue, 20 Feb 2007 13:10:27 +0100
Subject: [PATCH] After-merge fix: The declaration of "thr_client_alarm" had
 got lost, keep it in "mysys/thr_alarm.c".

mysys/thr_alarm.c:
  After-merge fix:
  In 4.1, the variable "thr_client_alarm" is declared in this module.
---
 mysys/thr_alarm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c
index 7ccc1dc5d2f..759544af17b 100644
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -36,6 +36,7 @@
 #define ETIME ETIMEDOUT
 #endif
 
+uint thr_client_alarm;
 static int alarm_aborted=1;			/* No alarm thread */
 my_bool thr_alarm_inited= 0;
 volatile my_bool alarm_thread_running= 0;