Commit 0daf91a6 authored by joerg@trift2's avatar joerg@trift2

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

into  trift2.:/MySQL/M41/merge-4.1
parents 8ddb3af5 0cdbda12
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#define ETIME ETIMEDOUT #define ETIME ETIMEDOUT
#endif #endif
uint thr_client_alarm;
static int alarm_aborted=1; /* No alarm thread */ static int alarm_aborted=1; /* No alarm thread */
my_bool thr_alarm_inited= 0; my_bool thr_alarm_inited= 0;
volatile my_bool alarm_thread_running= 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