summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/instance.cc
diff options
context:
space:
mode:
authoranozdrin/alik@booka. <>2006-11-21 17:31:03 +0300
committeranozdrin/alik@booka. <>2006-11-21 17:31:03 +0300
commitff0325f1625f2802d0080b506f164ca3aa9c1126 (patch)
tree6c79fe045d0eb04480800567a480ab43b9ad1d4f /server-tools/instance-manager/instance.cc
parent1efc86208071a7ed110c99276180c53ef2f7e20b (diff)
downloadmariadb-git-ff0325f1625f2802d0080b506f164ca3aa9c1126.tar.gz
Polishing:
1) add support for joinable threads to Thread class; 2) move checking of thread model to Manager from mysqlmanager.cc, because it is needed only for IM-main process.
Diffstat (limited to 'server-tools/instance-manager/instance.cc')
-rw-r--r--server-tools/instance-manager/instance.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc
index 84986c8c5ec..42a7fc94fdb 100644
--- a/server-tools/instance-manager/instance.cc
+++ b/server-tools/instance-manager/instance.cc
@@ -105,7 +105,7 @@ static int wait_process(My_process_info *pi)
couldn't use wait(), because it could return in any wait() in the program.
*/
- if (linuxthreads)
+ if (Manager::is_linux_threads())
wait(NULL); /* LinuxThreads were detected */
else
waitpid(*pi, NULL, 0);
@@ -564,7 +564,7 @@ int Instance::start()
instance_monitor= new Instance_monitor(this);
- if (instance_monitor == NULL || instance_monitor->start_detached())
+ if (instance_monitor == NULL || instance_monitor->start(Thread::DETACHED))
{
delete instance_monitor;
log_error("Instance::start(): failed to create the monitoring thread"