summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/guardian.h
diff options
context:
space:
mode:
authorunknown <petr@mysql.com>2005-08-05 14:35:30 +0400
committerunknown <petr@mysql.com>2005-08-05 14:35:30 +0400
commit85834c3b030e6680b02cf8b49ea71903d30a4ea2 (patch)
treebec1dbc1b759160295f274de25f51be456392277 /server-tools/instance-manager/guardian.h
parentc5bcb9f01c459e43e0c19e14b2910bea4af26393 (diff)
downloadmariadb-git-85834c3b030e6680b02cf8b49ea71903d30a4ea2.tar.gz
IM port fixes: fix crash on startup, add more error checking, get rid of unnecessary code.
server-tools/instance-manager/commands.cc: fix memory leak server-tools/instance-manager/guardian.cc: don't check pthread_mutex_lock/unlock return value, as it never returns error if properly used (no self deadlocks) and initialized server-tools/instance-manager/guardian.h: prototype fixed server-tools/instance-manager/instance_map.cc: don't check pthread_mutex_lock/unlock status, as it never returns error if properly used (no self deadlocks) and initialized server-tools/instance-manager/instance_map.h: prototype fixed server-tools/instance-manager/listener.cc: initialize highest-numbered descriptor to 0 for select before setting it with max(n, sockets[i]), ifdef unix-specific code server-tools/instance-manager/manager.cc: remove commented stuff server-tools/instance-manager/options.cc: fix crash in load_defaults, which happened on all Unix systems due to const char *Options::config_file= NULL. Check return value for GetModuleFileName. Get rid of obscure default_config_file[FN_REFLEN]= "/etc/my.cnf"; which was never used
Diffstat (limited to 'server-tools/instance-manager/guardian.h')
-rw-r--r--server-tools/instance-manager/guardian.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/server-tools/instance-manager/guardian.h b/server-tools/instance-manager/guardian.h
index 502dc86b2ae..e8992722f3c 100644
--- a/server-tools/instance-manager/guardian.h
+++ b/server-tools/instance-manager/guardian.h
@@ -100,8 +100,8 @@ public:
int stop_guard(Instance *instance);
/* Returns true if guardian thread is stopped */
int is_stopped();
- int lock();
- int unlock();
+ void lock();
+ void unlock();
public:
pthread_cond_t COND_guardian;