diff options
Diffstat (limited to 'server-tools/instance-manager/instance_options.cc')
| -rw-r--r-- | server-tools/instance-manager/instance_options.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc index ab97c86316b..7c41a556cc4 100644 --- a/server-tools/instance-manager/instance_options.cc +++ b/server-tools/instance-manager/instance_options.cc @@ -80,9 +80,7 @@ void Instance_options::get_pid_filename(char *result) char datadir[MAX_PATH_LEN]; if (mysqld_datadir == NULL) - { get_default_option(datadir, sizeof(datadir), "--datadir"); - } else strxnmov(datadir, MAX_PATH_LEN - 1, strchr(mysqld_datadir, '=') + 1, "/", NullS); @@ -106,8 +104,8 @@ pid_t Instance_options::get_pid() FILE *pid_file_stream; /* get the pid */ - if (pid_file_stream= my_fopen(pid_file_with_path, - O_RDONLY | O_BINARY, MYF(0))) + if ((pid_file_stream= my_fopen(pid_file_with_path, + O_RDONLY | O_BINARY, MYF(0))) != NULL) { pid_t pid; |