Commit 08df0556 authored by unknown's avatar unknown
Browse files

A post-merge fix.

parent 96b90824

server-tools/instance-manager/guardian.cc

+4 −4
Original line number Diff line number Diff line
@@ -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);

server-tools/instance-manager/mysql_connection.h

+1 −2
Original line number Diff line number Diff line
@@ -68,8 +68,7 @@ class Mysql_connection: public Thread 
  /* 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