From a5f2355cf6d9d4dd71de428410d0b805340c2d71 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 21 Oct 2005 03:25:07 +0400 Subject: Fix Bug#14107 (IM test failures on QNX) (v.2 with post-review fixes) server-tools/instance-manager/instance.cc: On QNX one cannot use fork() in multithreaded environment. Therefore we should use QNX's spawn() --- server-tools/instance-manager/instance.cc | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'server-tools/instance-manager') diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc index 945f8abe3c2..0756f0b4d9f 100644 --- a/server-tools/instance-manager/instance.cc +++ b/server-tools/instance-manager/instance.cc @@ -138,15 +138,25 @@ static int wait_process(My_process_info *pi) static int start_process(Instance_options *instance_options, My_process_info *pi) { +#ifndef __QNX__ *pi= fork(); +#else + /* + On QNX one cannot use fork() in multithreaded environment and we + should use spawn() or one of it's siblings instead. + Here we use spawnv(), which is a combination of fork() and execv() + in one call. It returns the pid of newly created process (>0) or -1 + */ + *pi= spawnv(P_NOWAIT, instance_options->mysqld_path, instance_options->argv); +#endif switch (*pi) { - case 0: + case 0: /* never happens on QNX */ execv(instance_options->mysqld_path, instance_options->argv); /* exec never returns */ exit(1); - case 1: - log_info("cannot fork() to start instance %s", + case -1: + log_info("cannot create a new process to start instance %s", instance_options->instance_name); return 1; } -- cgit v1.2.1