summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2007-02-12 19:55:33 +0100
committerunknown <joerg@trift2.>2007-02-12 19:55:33 +0100
commit2d2957c041708548a422d4e64bf2d3cc10051cf8 (patch)
tree6262dee3cfe59906af1850268dc9a1b1c1d48f06 /mysys
parent2a221c8014dd91fa80bbadc71c83f39e6d5704b4 (diff)
downloadmariadb-git-2d2957c041708548a422d4e64bf2d3cc10051cf8.tar.gz
Break a double declare of "uint thr_client_alarm" between "mysys/thr_alarm.c" and "mysys/my_pthread.c".
mysys/my_pthread.c: Break a double declare: "uint thr_client_alarm" is also declared in "mysys/thr_alarm.c", take it from there.
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_pthread.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c
index fd716448e43..19766a2d195 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -32,7 +32,6 @@
#endif
uint thd_lib_detected;
-uint thr_client_alarm;
#ifndef my_pthread_setprio
void my_pthread_setprio(pthread_t thread_id,int prior)