summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorjoerg@trift2. <>2007-02-12 20:13:34 +0100
committerjoerg@trift2. <>2007-02-12 20:13:34 +0100
commit0ba571bac3f1e27503b1823682971a3418b3d382 (patch)
treefc0fd2e5ade48056136afe18b6acda8246e0c16f /mysys
parentaa59e423d701b96956515551e6832a4536c22fce (diff)
downloadmariadb-git-0ba571bac3f1e27503b1823682971a3418b3d382.tar.gz
Fix a linkage problem with the previous patch for "thr_client_alarm".
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_pthread.c1
-rw-r--r--mysys/thr_alarm.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c
index 19766a2d195..fd716448e43 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -32,6 +32,7 @@
#endif
uint thd_lib_detected;
+uint thr_client_alarm;
#ifndef my_pthread_setprio
void my_pthread_setprio(pthread_t thread_id,int prior)
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c
index 8f342e269de..c8e1e55aac2 100644
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -37,7 +37,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;