diff options
| author | unknown <kent@mysql.com> | 2005-07-21 18:05:10 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-07-21 18:05:10 +0200 |
| commit | db146edcf219e62a88ff4e417315f5d92f201f50 (patch) | |
| tree | 8fada6d5bb418dc4ff86b318f44be9cb500cfa82 /innobase | |
| parent | 2de1318c47465d266b7849d54a6ec03a29123b3c (diff) | |
| download | mariadb-git-db146edcf219e62a88ff4e417315f5d92f201f50.tar.gz | |
sync0sync.c, sync0sync.h:
Declare 'mutex_list' and 'mutex_list_mutex' extern,
to avoid link error on OS X and gcc flag "-fno-common"
innobase/include/sync0sync.h:
Use 'extern' variable declarations, to avoid
"ld: multiple definitions of symbol" for 'mutex_list'
and 'mutex_list_mutex' on OS X and gcc flag "-fno-common"
innobase/sync/sync0sync.c:
Use 'extern' variable declarations, to avoid
"ld: multiple definitions of symbol" for 'mutex_list'
and 'mutex_list_mutex' on OS X and gcc flag "-fno-common"
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/include/sync0sync.h | 5 | ||||
| -rw-r--r-- | innobase/sync/sync0sync.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/innobase/include/sync0sync.h b/innobase/include/sync0sync.h index c798c047fa3..5955ab9a06a 100644 --- a/innobase/include/sync0sync.h +++ b/innobase/include/sync0sync.h @@ -522,10 +522,11 @@ extern ibool sync_order_checks_on; extern ibool sync_initialized; /* Global list of database mutexes (not OS mutexes) created. */ -UT_LIST_BASE_NODE_T(mutex_t) mutex_list; +typedef UT_LIST_BASE_NODE_T(mutex_t) ut_list_base_node_t; +extern ut_list_base_node_t mutex_list; /* Mutex protecting the mutex_list variable */ -mutex_t mutex_list_mutex; +extern mutex_t mutex_list_mutex; #ifndef UNIV_NONINL diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c index f0f0e9a3a2e..43249f4b96f 100644 --- a/innobase/sync/sync0sync.c +++ b/innobase/sync/sync0sync.c @@ -141,6 +141,12 @@ sync_thread_t* sync_thread_level_arrays; /* Mutex protecting sync_thread_level_arrays */ mutex_t sync_thread_mutex; +/* Global list of database mutexes (not OS mutexes) created. */ +ut_list_base_node_t mutex_list; + +/* Mutex protecting the mutex_list variable */ +mutex_t mutex_list_mutex; + /* Latching order checks start when this is set TRUE */ ibool sync_order_checks_on = FALSE; |