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:
@ -75,7 +75,7 @@ public:
|
||||
void lock();
|
||||
void unlock();
|
||||
|
||||
int init();
|
||||
bool init();
|
||||
|
||||
/*
|
||||
Process a given option and assign it to appropricate instance. This is
|
||||
@ -105,8 +105,7 @@ public:
|
||||
int create_instance(const LEX_STRING *instance_name,
|
||||
const Named_value_arr *options);
|
||||
|
||||
Instance_map(const char *default_mysqld_path_arg,
|
||||
Thread_registry &thread_registry_arg);
|
||||
Instance_map();
|
||||
~Instance_map();
|
||||
|
||||
/*
|
||||
@ -132,8 +131,6 @@ private:
|
||||
enum { START_HASH_SIZE = 16 };
|
||||
pthread_mutex_t LOCK_instance_map;
|
||||
HASH hash;
|
||||
|
||||
Thread_registry &thread_registry;
|
||||
};
|
||||
|
||||
#endif /* INCLUDES_MYSQL_INSTANCE_MANAGER_INSTANCE_MAP_H */
|
||||
|
Reference in New Issue
Block a user