Post-merge fixes.

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;

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);