diff options
| author | unknown <kostja@bodhi.local> | 2006-12-12 23:22:46 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-12-12 23:22:46 +0300 |
| commit | f19d9b41cd41f941f228cafd025f04f213ee2a94 (patch) | |
| tree | e0d27e22f258ef1f553dbe4846a3c27efa676969 /server-tools | |
| parent | fabf58c6cc475e0d3837f94b5e345d8be059d248 (diff) | |
| download | mariadb-git-f19d9b41cd41f941f228cafd025f04f213ee2a94.tar.gz | |
Post-merge fixes.
mysql-test/r/read_only.result:
A post-merge fix: update results.
server-tools/instance-manager/guardian.cc:
Remove initialization of a non-existent member.
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/guardian.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc index 4c601537075..1b451cd9933 100644 --- a/server-tools/instance-manager/guardian.cc +++ b/server-tools/instance-manager/guardian.cc @@ -53,8 +53,7 @@ Guardian::Guardian(Thread_registry *thread_registry_arg, :shutdown_requested(FALSE), stopped(FALSE), thread_registry(thread_registry_arg), - instance_map(instance_map_arg), - guarded_instances(0) + instance_map(instance_map_arg) { pthread_mutex_init(&LOCK_guardian, 0); pthread_cond_init(&COND_guardian, 0); |