From d2248d973e672eda139f8ca73f3769cba0aa4971 Mon Sep 17 00:00:00 2001 From: "kostja@bodhi.local" <> Date: Fri, 17 Nov 2006 20:07:52 +0300 Subject: [PATCH] A post-merge fix. --- server-tools/instance-manager/guardian.cc | 8 ++++---- server-tools/instance-manager/mysql_connection.h | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc index 1cb9aed559..1015e68158 100644 --- a/server-tools/instance-manager/guardian.cc +++ b/server-tools/instance-manager/guardian.cc @@ -63,11 +63,11 @@ Guardian::get_instance_state_name(enum_instance_state state) 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); diff --git a/server-tools/instance-manager/mysql_connection.h b/server-tools/instance-manager/mysql_connection.h index aceb2d6273..2db9523a10 100644 --- a/server-tools/instance-manager/mysql_connection.h +++ b/server-tools/instance-manager/mysql_connection.h @@ -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 -- 2.30.9