diff options
| author | unknown <joerg@trift2.> | 2007-02-20 13:02:39 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-02-20 13:02:39 +0100 |
| commit | 4a3472726bbac125ad8a8c1eb969e12c4a9bb9d7 (patch) | |
| tree | a99326ab5c53f35407390c8b1f7e87230536dd28 | |
| parent | f9fd924773b21134ebca2e4566bb1c40091d6823 (diff) | |
| parent | 6f21a5af6bec093063e803aaf4f1cd8ca1fa618c (diff) | |
| download | mariadb-git-4a3472726bbac125ad8a8c1eb969e12c4a9bb9d7.tar.gz | |
Merge trift2.:/MySQL/M40/clone-4.0
into trift2.:/MySQL/M41/merge-4.1
include/config-win.h:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/thr_alarm.c:
Auto merged
mysys/my_thr_init.c:
Not applicable to 4.1 in its current state.
sql/mysqld.cc:
Change was a backport already, null-merged to 4.1.
| -rw-r--r-- | mysys/thr_alarm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index 759544af17b..7ccc1dc5d2f 100644 --- 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; |