summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/instance_map.cc
diff options
context:
space:
mode:
Diffstat (limited to 'server-tools/instance-manager/instance_map.cc')
-rw-r--r--server-tools/instance-manager/instance_map.cc18
1 files changed, 15 insertions, 3 deletions
diff --git a/server-tools/instance-manager/instance_map.cc b/server-tools/instance-manager/instance_map.cc
index b70f622fa73..12f0c799d50 100644
--- a/server-tools/instance-manager/instance_map.cc
+++ b/server-tools/instance-manager/instance_map.cc
@@ -110,14 +110,26 @@ err_new_instance:
C_MODE_END
-Instance_map::Instance_map()
+Instance_map::Instance_map(const char *default_mysqld_path_arg,
+ const char *default_admin_user_arg,
+ const char *default_admin_password_arg)
{
- hash_init(&hash, default_charset_info, START_HASH_SIZE, 0, 0,
- get_instance_key, delete_instance, 0);
+ mysqld_path= default_mysqld_path_arg;
+ user= default_admin_user_arg;
+ password= default_admin_password_arg;
+
pthread_mutex_init(&LOCK_instance_map, 0);
}
+int Instance_map::init()
+{
+ if (hash_init(&hash, default_charset_info, START_HASH_SIZE, 0, 0,
+ get_instance_key, delete_instance, 0))
+ return 1;
+ return 0;
+}
+
Instance_map::~Instance_map()
{
pthread_mutex_lock(&LOCK_instance_map);