diff options
| author | unknown <petr@mysql.com> | 2005-06-07 17:57:20 +0400 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-06-07 17:57:20 +0400 |
| commit | 4e482bd3f222dced555767f9c93a56e8bad1ebac (patch) | |
| tree | 8f2068b3f14f3dd79f072c5b9cb2f4d16a9bd830 /server-tools/instance-manager/instance_options.cc | |
| parent | f250f8214a1959b369bb3eb35c58ee4d40cc19af (diff) | |
| download | mariadb-git-4e482bd3f222dced555767f9c93a56e8bad1ebac.tar.gz | |
several fixes to the previous patch
server-tools/instance-manager/instance_options.cc:
fix order of if branches
server-tools/instance-manager/instance_options.h:
portability fix
server-tools/instance-manager/parse_output.cc:
remove stupid comment
server-tools/instance-manager/parse_output.h:
portability fix
Diffstat (limited to 'server-tools/instance-manager/instance_options.cc')
| -rw-r--r-- | server-tools/instance-manager/instance_options.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc index 7c68ccc7207..0ae364e5b2d 100644 --- a/server-tools/instance-manager/instance_options.cc +++ b/server-tools/instance-manager/instance_options.cc @@ -370,19 +370,19 @@ int Instance_options::complete_initialization(const char *default_path, if (!gethostname(hostname, sizeof(hostname) - 1)) { if (instance_type & DEFAULT_SINGLE_INSTANCE) - strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", instance_name, "-", - hostname, ".pid", NullS); - else strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", hostname, ".pid", NullS); + else + strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", instance_name, + "-", hostname, ".pid", NullS); } else { if (instance_type & DEFAULT_SINGLE_INSTANCE) - strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", instance_name, + strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", "mysql", ".pid", NullS); else - strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", "mysql", + strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", instance_name, ".pid", NullS); } |