diff options
| author | msvensson@neptunus.(none) <> | 2006-09-25 09:34:34 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-09-25 09:34:34 +0200 |
| commit | 18f04d48a490b6c291b3b5d7069aec2e18374d41 (patch) | |
| tree | 935fd9f956877d025083038d55834a22895726af /server-tools/instance-manager/instance_options.cc | |
| parent | 2fe744c878ad2e8334bf33e98d078317928d7196 (diff) | |
| parent | d2ebe6be036958366e56170c72c6546ccc19d1e5 (diff) | |
| download | mariadb-git-18f04d48a490b6c291b3b5d7069aec2e18374d41.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my50-bug22379_runtime
into neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my51-bug22379_runtime
Diffstat (limited to 'server-tools/instance-manager/instance_options.cc')
| -rw-r--r-- | server-tools/instance-manager/instance_options.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc index 576096adfd2..f6ec751678f 100644 --- a/server-tools/instance-manager/instance_options.cc +++ b/server-tools/instance-manager/instance_options.cc @@ -406,7 +406,8 @@ pid_t Instance_options::get_pid() { pid_t pid; - fscanf(pid_file_stream, "%i", &pid); + if (fscanf(pid_file_stream, "%i", &pid) != 1) + pid= -1; my_fclose(pid_file_stream, MYF(0)); return pid; } |