bk commit into 5.1 tree (kostja:1.2358)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-12 23:22:46+03:00, kostja@stripped +2 -0
  Post-merge fixes.

  mysql-test/r/read_only.result@stripped, 2006-12-12 23:22:38+03:00, kostja@stripped +1 -1
    A post-merge fix: update results.

  server-tools/instance-manager/guardian.cc@stripped, 2006-12-12 23:22:38+03:00, kostja@stripped +1 -2
    Remove initialization of a non-existent member.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.1-runtime

--- 1.5/mysql-test/r/read_only.result	2006-12-12 23:23:04 +03:00
+++ 1.6/mysql-test/r/read_only.result	2006-12-12 23:23:04 +03:00
@@ -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;

--- 1.36/server-tools/instance-manager/guardian.cc	2006-12-12 23:23:04 +03:00
+++ 1.37/server-tools/instance-manager/guardian.cc	2006-12-12 23:23:04 +03:00
@@ -53,8 +53,7 @@ Guardian::Guardian(Thread_registry *thre
   :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);