bk commit into 5.1 tree (kostja:1.2369)

[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-11-17 20:07:52+03:00, kostja@stripped +2 -0
  A post-merge fix.

  server-tools/instance-manager/guardian.cc@stripped, 2006-11-17 20:07:48+03:00, kostja@stripped +4 -4
    A post-merge fix.

  server-tools/instance-manager/mysql_connection.h@stripped, 2006-11-17 20:07:48+03:00, kostja@stripped +1 -2
    A post-merge fix.

# 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/m51lamp

--- 1.31/server-tools/instance-manager/guardian.cc	2006-11-17 20:08:01 +03:00
+++ 1.32/server-tools/instance-manager/guardian.cc	2006-11-17 20:08:01 +03:00
@@ -63,11 +63,11 @@ Guardian::get_instance_state_name(enum_i
 Guardian::Guardian(Thread_registry *thread_registry_arg,
                    Instance_map *instance_map_arg,
                    uint monitoring_interval_arg)
-  :monitoring_interval(monitoring_interval_arg),
-  shutdown_requested(FALSE),
-  stopped(FALSE),
+  :stopped(FALSE),
+  monitoring_interval(monitoring_interval_arg),
   thread_registry(thread_registry_arg),
-  instance_map(instance_map_arg)
+  instance_map(instance_map_arg),
+  shutdown_requested(FALSE)
 {
   pthread_mutex_init(&LOCK_guardian, 0);
   pthread_cond_init(&COND_guardian, 0);

--- 1.6/server-tools/instance-manager/mysql_connection.h	2006-11-17 20:08:01 +03:00
+++ 1.7/server-tools/instance-manager/mysql_connection.h	2006-11-17 20:08:01 +03:00
@@ -68,8 +68,7 @@ private:
   /* Names are conventionally the same as in mysqld */
   int check_connection();
   int do_command();
-  int dispatch_command(enum enum_server_command command,
-                       const char *text, uint len);
+  int dispatch_command(enum enum_server_command command, const char *text);
 };
 
 #endif // INCLUDES_MYSQL_INSTANCE_MANAGER_MYSQL_CONNECTION_H