Merge trift2.:/MySQL/M40/clone-4.0

into trift2.:/MySQL/M41/merge-4.1

Merge trift2.:/MySQL/M40/clone-4.0
into trift2.:/MySQL/M41/merge-4.1
0daf91a6 · joerg@trift2 · 8ddb3af5 · 0cdbda12 · 0daf91a6
Commit 0daf91a6 authored Feb 20, 2007 by joerg@trift2
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

mysys/thr_alarm.c mysys/thr_alarm.c +0 -1

No files found.
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -36,7 +36,6 @@
 #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;