database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

A post-merge fix.

Browse Source
This commit is contained in:
unknown
2006-11-17 20:07:52 +03:00
parent 96b90824d4
commit 08df05560e
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server-tools/instance-manager/guardian.cc
View File

@ -63,11 +63,11 @@ Guardian::get_instance_state_name(enum_instance_state state)
Guardian::Guardian(Thread_registry *thread_registry_arg, Guardian::Guardian(Thread_registry *thread_registry_arg,
Instance_map *instance_map_arg, Instance_map *instance_map_arg,
uint monitoring_interval_arg) uint monitoring_interval_arg)
:monitoring_interval(monitoring_interval_arg), :stopped(FALSE),
shutdown_requested(FALSE), monitoring_interval(monitoring_interval_arg),
stopped(FALSE),
thread_registry(thread_registry_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_mutex_init(&LOCK_guardian, 0);
pthread_cond_init(&COND_guardian, 0); pthread_cond_init(&COND_guardian, 0);

3
server-tools/instance-manager/mysql_connection.h
View File

@ -68,8 +68,7 @@ private:
/* Names are conventionally the same as in mysqld */ /* Names are conventionally the same as in mysqld */
int check_connection(); int check_connection();
int do_command(); int do_command();
int dispatch_command(enum enum_server_command command, int dispatch_command(enum enum_server_command command, const char *text);
const char *text, uint len);
}; };
#endif // INCLUDES_MYSQL_INSTANCE_MANAGER_MYSQL_CONNECTION_H #endif // INCLUDES_MYSQL_INSTANCE_MANAGER_MYSQL_CONNECTION_H