From f19d9b41cd41f941f228cafd025f04f213ee2a94 Mon Sep 17 00:00:00 2001
From: unknown <kostja@bodhi.local>
Date: Tue, 12 Dec 2006 23:22:46 +0300
Subject: [PATCH] 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.
---
 mysql-test/r/read_only.result             | 2 +-
 server-tools/instance-manager/guardian.cc | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/read_only.result b/mysql-test/r/read_only.result
index d479fdb4c3c..f270f1ed5ad 100644
--- a/mysql-test/r/read_only.result
+++ b/mysql-test/r/read_only.result
@@ -89,11 +89,11 @@ select @@global.read_only;
 @@global.read_only
 1
 unlock tables;
-set global read_only=0;
 drop temporary table ttt;
 ERROR 42S02: Unknown table 'ttt'
 drop temporary table if exists ttt;
 Warnings:
 Note	1051	Unknown table 'ttt'
+set global read_only=0;
 drop table t1,t2;
 drop user test@localhost;
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);