diff options
| author | unknown <kostja@bodhi.local> | 2006-11-17 20:07:52 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-11-17 20:07:52 +0300 |
| commit | 08df05560edb4beeccdf605f43008750731f6e18 (patch) | |
| tree | 628b2a57a49bb917f62b0dd155e5dab8727939c0 | |
| parent | 96b90824d4d2688ee9c73d34bed8927da396f1c4 (diff) | |
| download | mariadb-git-08df05560edb4beeccdf605f43008750731f6e18.tar.gz | |
A post-merge fix.
| -rw-r--r-- | server-tools/instance-manager/guardian.cc | 8 | ||||
| -rw-r--r-- | 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 1cb9aed559b..1015e68158a 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 aceb2d62736..2db9523a10a 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 |