Commit 74fed0c3 authored by joerg@trift2's avatar joerg@trift2

After-merge fix:

The declaration of "thr_client_alarm" had got lost, keep it in "mysys/thr_alarm.c".
parent 0daf91a6
......@@ -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;
......
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