From 193650b8d9f88910d763c6c593912a4e83dd9643 Mon Sep 17 00:00:00 2001
From: unknown <ram@gw.mysql.r18.ru>
Date: Wed, 26 Jan 2005 18:37:49 +0400
Subject: [PATCH] timed_mutexes moved to include/my_sys.h and mysys/my_static.c
 to avoid linking problems referring to the variable from .c programs.

---
 include/my_sys.h  | 2 ++
 mysys/my_static.c | 2 ++
 sql/mysql_priv.h  | 1 -
 sql/mysqld.cc     | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/my_sys.h b/include/my_sys.h
index d11dc4a3e46..72d4bec74b1 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -259,6 +259,8 @@ extern char	wild_many,wild_one,wild_prefix;
 extern const char *charsets_dir;
 extern char *defaults_extra_file;
 
+extern my_bool timed_mutexes;
+
 typedef struct wild_file_pack	/* Struct to hold info when selecting files */
 {
   uint		wilds;		/* How many wildcards */
diff --git a/mysys/my_static.c b/mysys/my_static.c
index 57d41676390..8207463ea50 100644
--- a/mysys/my_static.c
+++ b/mysys/my_static.c
@@ -25,6 +25,8 @@
 #include "my_alarm.h"
 #endif
 
+my_bool timed_mutexes= 0;
+
 	/* from my_init */
 my_string	home_dir=0,my_progname=0;
 char		NEAR curr_dir[FN_REFLEN]= {0},
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 5a222a1ce10..0349d9a635f 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1002,7 +1002,6 @@ extern ulong table_cache_size;
 extern ulong max_connections,max_connect_errors, connect_timeout;
 extern ulong slave_net_timeout;
 extern ulong max_user_connections;
-extern my_bool timed_mutexes;
 extern ulong what_to_log,flush_time;
 extern ulong query_buff_size, thread_stack,thread_stack_min;
 extern ulong binlog_cache_size, max_binlog_cache_size, open_files_limit;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 94eb34954ba..e99acd7ed82 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -335,7 +335,6 @@ ulong binlog_cache_use= 0, binlog_cache_disk_use= 0;
 ulong max_connections,max_used_connections,
       max_connect_errors, max_user_connections = 0;
 ulong thread_id=1L,current_pid;
-my_bool timed_mutexes= 0;
 ulong slow_launch_threads = 0, sync_binlog_period;
 ulong expire_logs_days = 0;
 ulong rpl_recovery_rank=0;