diff options
| author | unknown <anozdrin@mysql.com> | 2006-06-19 14:16:10 +0400 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2006-06-19 14:16:10 +0400 |
| commit | 645e3135b210a6f3728b2a6c5cfc87ec274419b6 (patch) | |
| tree | 29ea0fdc269f8eb47647db54ead61096cbb102b4 /server-tools/instance-manager/guardian.cc | |
| parent | 799c5935f0f10073cd23f037bbb027e11d4c1013 (diff) | |
| download | mariadb-git-645e3135b210a6f3728b2a6c5cfc87ec274419b6.tar.gz | |
The second fix for BUG#19391: IM fails to start after two executions.
server-tools/instance-manager/guardian.cc:
Removed erroneous unlock() in Guardian_thread::init():
instance_map is unlocked in the caller.
server-tools/instance-manager/instance_map.cc:
Added TODO comment.
server-tools/instance-manager/manager.cc:
Make initialization of alarm infrustructure before starting Guardian
thread, because Guardian uses thr_alarm().
Diffstat (limited to 'server-tools/instance-manager/guardian.cc')
| -rw-r--r-- | server-tools/instance-manager/guardian.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc index fa9d877fde6..24844e05776 100644 --- a/server-tools/instance-manager/guardian.cc +++ b/server-tools/instance-manager/guardian.cc @@ -271,10 +271,7 @@ int Guardian_thread::init() { if (!(instance->options.nonguarded)) if (guard(instance, TRUE)) /* do not lock guardian */ - { - instance_map->unlock(); return 1; - } } return 0; |