1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Port cleanups, trivial refactoring and code rearrangements from

Alik's patch for BUG#22306: STOP INSTANCE can not be applied for 
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
This commit is contained in:
kostja@bodhi.local
2006-11-18 01:34:44 +03:00
parent d2248d973e
commit 2fc4562d63
22 changed files with 671 additions and 585 deletions

View File

@ -88,21 +88,19 @@ public:
static bool is_mysqld_compatible_name(const LEX_STRING *name);
public:
Instance(Thread_registry &thread_registry_arg);
Instance();
~Instance();
int init(const LEX_STRING *name_arg);
int complete_initialization(Instance_map *instance_map_arg,
const char *mysqld_path);
bool init(const LEX_STRING *name_arg);
bool complete_initialization();
bool is_running();
bool is_mysqld_running();
int start();
int stop();
/* send a signal to the instance */
void kill_instance(int signo);
void kill_mysqld(int signo);
bool is_crashed();
void set_crash_flag_n_wake_all();
Instance_map *get_map();
/*
The operation is intended to check if the instance is mysqld-compatible
@ -121,7 +119,6 @@ public:
public:
enum { DEFAULT_SHUTDOWN_DELAY= 35 };
Instance_options options;
Thread_registry &thread_registry;
private:
/* This attributes is a flag, specifies if the instance has been crashed. */
@ -155,7 +152,6 @@ private:
stop in Instance::stop()
*/
pthread_cond_t COND_instance_stopped;
Instance_map *instance_map;
void remove_pid();
};