diff options
| author | unknown <reggie@fedora.(none)> | 2005-08-04 09:33:44 -0500 |
|---|---|---|
| committer | unknown <reggie@fedora.(none)> | 2005-08-04 09:33:44 -0500 |
| commit | 9a2ea3700bffdd11dcc5a9dea817075594bb850e (patch) | |
| tree | 7d2b6ce9972b0698b18b7bb697e5c7f1fea4fb75 /server-tools/instance-manager/instance_map.cc | |
| parent | be22eacb3b32ae6d6766ae83056c90043dbe6846 (diff) | |
| parent | 55b4cb009e029a9ee626d229c5d8520b02773843 (diff) | |
| download | mariadb-git-9a2ea3700bffdd11dcc5a9dea817075594bb850e.tar.gz | |
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into fedora.(none):/home/reggie/bk/im_patch
server-tools/instance-manager/manager.cc:
Auto merged
server-tools/instance-manager/mysqlmanager.cc:
Auto merged
server-tools/instance-manager/options.h:
Auto merged
server-tools/instance-manager/commands.cc:
final merge of IM port code for Windows
server-tools/instance-manager/instance_map.cc:
final merge of IM port code for Windows
server-tools/instance-manager/options.cc:
final merge of IM port code for Windows
Diffstat (limited to 'server-tools/instance-manager/instance_map.cc')
| -rw-r--r-- | server-tools/instance-manager/instance_map.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/server-tools/instance-manager/instance_map.cc b/server-tools/instance-manager/instance_map.cc index 7356d79e27a..802f085aaed 100644 --- a/server-tools/instance-manager/instance_map.cc +++ b/server-tools/instance-manager/instance_map.cc @@ -139,13 +139,23 @@ Instance_map::~Instance_map() int Instance_map::lock() { +#ifdef __WIN__ + pthread_mutex_lock(&LOCK_instance_map); + return 0; +#else return pthread_mutex_lock(&LOCK_instance_map); +#endif } int Instance_map::unlock() { +#ifdef __WIN__ + pthread_mutex_unlock(&LOCK_instance_map); + return 0; +#else return pthread_mutex_unlock(&LOCK_instance_map); +#endif } |