mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge rurik.mysql.com:/home/igor/mysql-5.0

Browse source 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
This commit is contained in:
unknown 2005-06-07 07:52:36 -07:00
commit 37e3dc839c
4 changed files with 10 additions and 8 deletions
Show stats 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);
}

3
server-tools/instance-manager/instance_options.h
View file

@ -34,7 +34,8 @@
don't have to synchronize between threads.
*/
enum { USUAL_INSTANCE= 0, DEFAULT_SINGLE_INSTANCE };
#define USUAL_INSTANCE 0
#define DEFAULT_SINGLE_INSTANCE 1
class Instance_options
{

2
server-tools/instance-manager/parse_output.cc
View file

@ -86,7 +86,7 @@ int parse_output_and_get_value(const char *command, const char *word,
an option value) or the whole line (if flag)
*/
linep+= found_word_len; /* swallow the previous one */
if (flag & GET_VALUE) /* not GET_LINE */
if (flag & GET_VALUE)
{
get_word((const char **) &linep, &found_word_len, NONSPACE);
if (input_buffer_len <= found_word_len)

3
server-tools/instance-manager/parse_output.h
View file

@ -16,7 +16,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
enum { GET_VALUE= 1, GET_LINE };
#define GET_VALUE 1
#define GET_LINE 2
int parse_output_and_get_value(const char *command, const char *word,
char *result, size_t input_buffer_len,