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.
This commit is contained in:
parent
4a3472726b
commit
cf933534ea
@ -36,6 +36,7 @@
|
|||||||
#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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user