diff options
| author | unknown <joerg@trift2.> | 2007-02-20 13:10:27 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-02-20 13:10:27 +0100 |
| commit | cf933534eac84b998de0853ff809f828405b7e00 (patch) | |
| tree | c2559360f7a862a712b849468a18cf6ef74a7a16 /mysys | |
| parent | 4a3472726bbac125ad8a8c1eb969e12c4a9bb9d7 (diff) | |
| download | mariadb-git-cf933534eac84b998de0853ff809f828405b7e00.tar.gz | |
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.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/thr_alarm.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; |