database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

several fixes to the previous patch

Browse Source 
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
This commit is contained in:
unknown
2005-06-07 17:57:20 +04:00
parent f250f8214a
commit 4e482bd3f2
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server-tools/instance-manager/instance_options.cc
View File

@@ -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);
}