2004-10-23 09:32:52 +02:00
|
|
|
/* Copyright (C) 2004 MySQL AB
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
|
|
|
|
#ifdef __GNUC__
|
|
|
|
#pragma implementation
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "instance_options.h"
|
2005-03-22 00:04:14 +01:00
|
|
|
|
2005-01-25 11:54:56 +01:00
|
|
|
#include "parse_output.h"
|
|
|
|
#include "buffer.h"
|
2005-03-22 00:04:14 +01:00
|
|
|
|
2004-10-23 09:32:52 +02:00
|
|
|
#include <my_sys.h>
|
|
|
|
#include <signal.h>
|
|
|
|
#include <m_string.h>
|
|
|
|
|
2005-01-25 11:54:56 +01:00
|
|
|
|
2005-02-11 12:21:59 +01:00
|
|
|
/*
|
|
|
|
Get compiled-in value of default_option
|
|
|
|
|
|
|
|
SYNOPSYS
|
|
|
|
get_default_option()
|
|
|
|
result buffer to put found value
|
|
|
|
result_len buffer size
|
2005-05-15 23:54:02 +02:00
|
|
|
option_name the name of the option, prefixed with "--"
|
2005-02-11 12:21:59 +01:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
|
|
|
Get compile-in value of requested option from server
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 - ok
|
|
|
|
1 - error occured
|
|
|
|
*/
|
|
|
|
|
2005-05-15 23:54:02 +02:00
|
|
|
|
2005-02-11 12:21:59 +01:00
|
|
|
int Instance_options::get_default_option(char *result, size_t result_len,
|
|
|
|
const char *option_name)
|
2005-01-25 11:54:56 +01:00
|
|
|
{
|
|
|
|
int position= 0;
|
2005-02-11 12:21:59 +01:00
|
|
|
int rc= 1;
|
2005-01-25 11:54:56 +01:00
|
|
|
char verbose_option[]= " --no-defaults --verbose --help";
|
|
|
|
|
2005-04-09 12:28:39 +02:00
|
|
|
Buffer cmd(strlen(mysqld_path) + sizeof(verbose_option) + 1);
|
2005-02-11 12:21:59 +01:00
|
|
|
if (cmd.get_size()) /* malloc succeeded */
|
|
|
|
{
|
|
|
|
cmd.append(position, mysqld_path, strlen(mysqld_path));
|
|
|
|
position+= strlen(mysqld_path);
|
|
|
|
cmd.append(position, verbose_option, sizeof(verbose_option) - 1);
|
|
|
|
position+= sizeof(verbose_option) - 1;
|
|
|
|
cmd.append(position, "\0", 1);
|
|
|
|
|
|
|
|
if (cmd.is_error())
|
|
|
|
goto err;
|
|
|
|
/* get the value from "mysqld --help --verbose" */
|
|
|
|
rc= parse_output_and_get_value(cmd.buffer, option_name + 2,
|
|
|
|
result, result_len);
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
err:
|
|
|
|
return 1;
|
2005-01-25 11:54:56 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-05-15 23:54:02 +02:00
|
|
|
/*
|
|
|
|
Get compiled-in value of default_option
|
|
|
|
|
|
|
|
SYNOPSYS
|
|
|
|
get_default_option()
|
|
|
|
result buffer to put found value
|
|
|
|
result_len buffer size
|
|
|
|
option_name the name of the option, prefixed with "--"
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
|
|
|
Get compile-in value of requested option from server
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 - ok
|
|
|
|
1 - error occured
|
|
|
|
*/
|
|
|
|
|
2005-04-09 12:28:39 +02:00
|
|
|
int Instance_options::fill_log_options()
|
|
|
|
{
|
|
|
|
Buffer buff;
|
|
|
|
uint position= 0;
|
|
|
|
char **tmp_argv= argv;
|
2005-05-15 23:54:02 +02:00
|
|
|
enum { MAX_LOG_OPTION_LENGTH= 256 };
|
2005-04-09 12:28:39 +02:00
|
|
|
char datadir[MAX_LOG_OPTION_LENGTH];
|
|
|
|
char hostname[MAX_LOG_OPTION_LENGTH];
|
|
|
|
uint hostname_length;
|
|
|
|
struct log_files_st
|
|
|
|
{
|
|
|
|
const char *name;
|
|
|
|
uint length;
|
2005-05-15 23:54:02 +02:00
|
|
|
char **value;
|
2005-04-09 12:28:39 +02:00
|
|
|
const char *default_suffix;
|
2005-05-15 23:54:02 +02:00
|
|
|
} logs_st[]=
|
2005-04-09 12:28:39 +02:00
|
|
|
{
|
2005-05-15 23:54:02 +02:00
|
|
|
{"--log-error", 11, &(logs[LOG_ERROR]), ".err"},
|
|
|
|
{"--log", 5, &(logs[LOG_GENERAL]), ".log"},
|
|
|
|
{"--log-slow-queries", 18, &(logs[LOG_SLOW]), "-slow.log"},
|
2005-04-09 12:28:39 +02:00
|
|
|
{NULL, 0, NULL, NULL}
|
|
|
|
};
|
|
|
|
struct log_files_st *log_files;
|
|
|
|
|
|
|
|
/* compute hostname and datadir for the instance */
|
|
|
|
if (mysqld_datadir == NULL)
|
|
|
|
{
|
|
|
|
if (get_default_option(datadir,
|
|
|
|
MAX_LOG_OPTION_LENGTH, "--datadir"))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
else /* below is safe, as --datadir always has a value */
|
|
|
|
strncpy(datadir, strchr(mysqld_datadir, '=') + 1,
|
|
|
|
MAX_LOG_OPTION_LENGTH);
|
|
|
|
|
|
|
|
if (gethostname(hostname,sizeof(hostname)-1) < 0)
|
|
|
|
strmov(hostname, "mysql");
|
|
|
|
|
|
|
|
hostname[MAX_LOG_OPTION_LENGTH - 1]= 0; /* Safety */
|
|
|
|
hostname_length= strlen(hostname);
|
|
|
|
|
|
|
|
|
2005-05-15 23:54:02 +02:00
|
|
|
for (log_files= logs_st; log_files->name; log_files++)
|
2005-04-09 12:28:39 +02:00
|
|
|
{
|
2005-05-15 23:54:02 +02:00
|
|
|
for (int i=0; (argv[i] != 0); i++)
|
2005-04-09 12:28:39 +02:00
|
|
|
{
|
2005-05-15 23:54:02 +02:00
|
|
|
if (!strncmp(argv[i], log_files->name, log_files->length))
|
2005-04-09 12:28:39 +02:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
This is really log_files->name option if and only if it is followed
|
|
|
|
by '=', '\0' or space character. This way we can distinguish such
|
|
|
|
options as '--log' and '--log-bin'. This is checked in the following
|
|
|
|
two statements.
|
|
|
|
*/
|
2005-05-15 23:54:02 +02:00
|
|
|
if (argv[i][log_files->length] == '\0' ||
|
|
|
|
my_isspace(default_charset_info, argv[i][log_files->length]))
|
2005-04-09 12:28:39 +02:00
|
|
|
{
|
|
|
|
char full_name[MAX_LOG_OPTION_LENGTH];
|
|
|
|
|
|
|
|
fn_format(full_name, hostname, datadir, "",
|
|
|
|
MY_UNPACK_FILENAME | MY_SAFE_PATH);
|
|
|
|
|
|
|
|
|
|
|
|
if ((MAX_LOG_OPTION_LENGTH - strlen(full_name)) >
|
|
|
|
strlen(log_files->default_suffix))
|
|
|
|
{
|
|
|
|
strcpy(full_name + strlen(full_name),
|
|
|
|
log_files->default_suffix);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
goto err;
|
|
|
|
|
2005-05-15 23:54:02 +02:00
|
|
|
/*
|
|
|
|
If there were specified two identical logfiles options,
|
|
|
|
we would loose some memory in MEM_ROOT here. However
|
|
|
|
this situation is not typical.
|
|
|
|
*/
|
|
|
|
*(log_files->value)= strdup_root(&alloc, full_name);
|
2005-04-09 12:28:39 +02:00
|
|
|
}
|
|
|
|
|
2005-05-15 23:54:02 +02:00
|
|
|
if (argv[i][log_files->length] == '=')
|
2005-04-09 12:28:39 +02:00
|
|
|
{
|
|
|
|
char full_name[MAX_LOG_OPTION_LENGTH];
|
|
|
|
|
2005-05-15 23:54:02 +02:00
|
|
|
fn_format(full_name, argv[i] +log_files->length + 1,
|
2005-04-09 12:28:39 +02:00
|
|
|
datadir, "", MY_UNPACK_FILENAME | MY_SAFE_PATH);
|
|
|
|
|
|
|
|
if (!(*(log_files->value)=
|
|
|
|
strdup_root(&alloc, full_name)))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err:
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-05-15 23:54:02 +02:00
|
|
|
/*
|
|
|
|
Get the full pid file name with path
|
|
|
|
|
|
|
|
SYNOPSYS
|
|
|
|
get_pid_filaname()
|
|
|
|
result buffer to sotre the pidfile value
|
|
|
|
|
|
|
|
IMPLEMENTATION
|
|
|
|
Get the data directory, then get the pid filename
|
|
|
|
(which is always set for an instance), then load the
|
|
|
|
full path with my_load_path(). It takes into account
|
|
|
|
whether it is already an absolute path or it should be
|
|
|
|
prefixed with the datadir and so on.
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 - ok
|
|
|
|
1 - error occured
|
|
|
|
*/
|
|
|
|
|
2005-02-15 02:38:33 +01:00
|
|
|
int Instance_options::get_pid_filename(char *result)
|
2005-01-25 11:54:56 +01:00
|
|
|
{
|
|
|
|
const char *pid_file= mysqld_pid_file;
|
|
|
|
char datadir[MAX_PATH_LEN];
|
|
|
|
|
2005-02-27 16:41:34 +01:00
|
|
|
if (!(mysqld_datadir))
|
2005-02-15 02:38:33 +01:00
|
|
|
{
|
|
|
|
/* we might get an error here if we have wrong path to the mysqld binary */
|
|
|
|
if (get_default_option(datadir, sizeof(datadir), "--datadir"))
|
|
|
|
return 1;
|
|
|
|
}
|
2005-01-25 11:54:56 +01:00
|
|
|
else
|
|
|
|
strxnmov(datadir, MAX_PATH_LEN - 1, strchr(mysqld_datadir, '=') + 1,
|
|
|
|
"/", NullS);
|
|
|
|
|
2005-02-11 12:21:59 +01:00
|
|
|
DBUG_ASSERT(mysqld_pid_file);
|
|
|
|
pid_file= strchr(pid_file, '=') + 1;
|
2005-01-25 11:54:56 +01:00
|
|
|
|
|
|
|
/* get the full path to the pidfile */
|
|
|
|
my_load_path(result, pid_file, datadir);
|
2005-02-15 02:38:33 +01:00
|
|
|
return 0;
|
2005-01-25 11:54:56 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int Instance_options::unlink_pidfile()
|
|
|
|
{
|
2005-02-11 12:21:59 +01:00
|
|
|
return unlink(pid_file_with_path);
|
2005-01-25 11:54:56 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pid_t Instance_options::get_pid()
|
|
|
|
{
|
2005-02-11 12:21:59 +01:00
|
|
|
FILE *pid_file_stream;
|
2005-01-25 11:54:56 +01:00
|
|
|
|
|
|
|
/* get the pid */
|
2005-02-13 13:13:33 +01:00
|
|
|
if ((pid_file_stream= my_fopen(pid_file_with_path,
|
|
|
|
O_RDONLY | O_BINARY, MYF(0))) != NULL)
|
2005-01-25 11:54:56 +01:00
|
|
|
{
|
|
|
|
pid_t pid;
|
|
|
|
|
|
|
|
fscanf(pid_file_stream, "%i", &pid);
|
|
|
|
my_fclose(pid_file_stream, MYF(0));
|
|
|
|
return pid;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-02-18 12:58:30 +01:00
|
|
|
int Instance_options::complete_initialization(const char *default_path,
|
|
|
|
int only_instance)
|
2004-10-23 09:32:52 +02:00
|
|
|
{
|
2005-01-25 11:54:56 +01:00
|
|
|
const char *tmp;
|
2004-10-23 09:32:52 +02:00
|
|
|
|
2005-02-27 16:41:34 +01:00
|
|
|
if (!(mysqld_path))
|
2004-10-23 09:32:52 +02:00
|
|
|
{
|
|
|
|
if (!(mysqld_path= strdup_root(&alloc, default_path)))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2005-02-27 16:41:34 +01:00
|
|
|
if (mysqld_port)
|
|
|
|
mysqld_port_val= atoi(strchr(mysqld_port, '=') + 1);
|
|
|
|
|
|
|
|
if (shutdown_delay)
|
|
|
|
shutdown_delay_val= atoi(shutdown_delay);
|
|
|
|
|
2005-01-25 11:54:56 +01:00
|
|
|
if (!(tmp= strdup_root(&alloc, "--no-defaults")))
|
2004-10-23 09:32:52 +02:00
|
|
|
goto err;
|
|
|
|
|
2005-02-27 16:41:34 +01:00
|
|
|
if (!(mysqld_pid_file))
|
2004-10-23 09:32:52 +02:00
|
|
|
{
|
2005-01-25 11:54:56 +01:00
|
|
|
char pidfilename[MAX_PATH_LEN];
|
|
|
|
char hostname[MAX_PATH_LEN];
|
2005-02-18 12:58:30 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
If we created only one istance [mysqld], because no config. files were
|
|
|
|
found, we would like to model mysqld pid file values.
|
|
|
|
*/
|
2005-01-25 11:54:56 +01:00
|
|
|
if (!gethostname(hostname, sizeof(hostname) - 1))
|
2005-02-18 12:58:30 +01:00
|
|
|
(only_instance == 0) ?
|
|
|
|
strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", instance_name, "-",
|
|
|
|
hostname, ".pid", NullS):
|
|
|
|
strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", hostname,
|
|
|
|
".pid", NullS);
|
|
|
|
|
2005-01-25 11:54:56 +01:00
|
|
|
else
|
2005-02-18 12:58:30 +01:00
|
|
|
(only_instance == 0) ?
|
2005-01-25 11:54:56 +01:00
|
|
|
strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", instance_name,
|
2005-02-18 12:58:30 +01:00
|
|
|
".pid", NullS):
|
|
|
|
strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", "mysql",
|
2005-01-25 11:54:56 +01:00
|
|
|
".pid", NullS);
|
|
|
|
|
|
|
|
add_option(pidfilename);
|
2004-10-23 09:32:52 +02:00
|
|
|
}
|
|
|
|
|
2005-02-15 02:38:33 +01:00
|
|
|
if (get_pid_filename(pid_file_with_path))
|
|
|
|
goto err;
|
2005-02-11 12:21:59 +01:00
|
|
|
|
2005-01-25 11:54:56 +01:00
|
|
|
/* we need to reserve space for the final zero + possible default options */
|
|
|
|
if (!(argv= (char**) alloc_root(&alloc, (options_array.elements + 1
|
|
|
|
+ MAX_NUMBER_OF_DEFAULT_OPTIONS) * sizeof(char*))))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* the path must be first in the argv */
|
|
|
|
if (add_to_argv(mysqld_path))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (add_to_argv(tmp))
|
|
|
|
goto err;
|
2004-10-23 09:32:52 +02:00
|
|
|
|
|
|
|
memcpy((gptr) (argv + filled_default_options), options_array.buffer,
|
|
|
|
options_array.elements*sizeof(char*));
|
|
|
|
argv[filled_default_options + options_array.elements]= 0;
|
|
|
|
|
2005-04-09 12:28:39 +02:00
|
|
|
fill_log_options();
|
|
|
|
|
2004-10-23 09:32:52 +02:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
err:
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Assigns given value to the appropriate option from the class.
|
|
|
|
|
|
|
|
SYNOPSYS
|
|
|
|
add_option()
|
|
|
|
option string with the option prefixed by --
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
|
|
|
The method is called from the option handling routine.
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 - ok
|
|
|
|
1 - error occured
|
|
|
|
*/
|
|
|
|
|
|
|
|
int Instance_options::add_option(const char* option)
|
|
|
|
{
|
|
|
|
char *tmp;
|
2004-11-02 08:11:03 +01:00
|
|
|
enum { SAVE_VALUE= 1, SAVE_WHOLE, SAVE_WHOLE_AND_ADD };
|
|
|
|
struct selected_options_st
|
2004-10-23 09:32:52 +02:00
|
|
|
{
|
2004-11-02 08:11:03 +01:00
|
|
|
const char *name;
|
|
|
|
uint length;
|
|
|
|
const char **value;
|
|
|
|
uint type;
|
|
|
|
} options[]=
|
2004-10-23 09:32:52 +02:00
|
|
|
{
|
2004-11-02 08:11:03 +01:00
|
|
|
{"--socket=", 9, &mysqld_socket, SAVE_WHOLE_AND_ADD},
|
|
|
|
{"--port=", 7, &mysqld_port, SAVE_WHOLE_AND_ADD},
|
|
|
|
{"--datadir=", 10, &mysqld_datadir, SAVE_WHOLE_AND_ADD},
|
|
|
|
{"--bind-address=", 15, &mysqld_bind_address, SAVE_WHOLE_AND_ADD},
|
|
|
|
{"--pid-file=", 11, &mysqld_pid_file, SAVE_WHOLE_AND_ADD},
|
2004-12-28 22:13:32 +01:00
|
|
|
{"--mysqld-path=", 14, &mysqld_path, SAVE_VALUE},
|
more fixes for IM to substitude mysqld_safe in startup scripts
BitKeeper/deleted/.del-thread_repository.cc~bba09f64f8cb4037:
Delete: server-tools/instance-manager/thread_repository.cc
BitKeeper/deleted/.del-thread_repository.h~e6a3b9cab7a6612a:
Delete: server-tools/instance-manager/thread_repository.h
server-tools/instance-manager/commands.cc:
All instances are guarded by default now, so we need to perform check on whether the instance is nonguarded,
rather then guarded when adding it to the list of guarded instnces.
server-tools/instance-manager/guardian.cc:
Guardian rewritten to start instances by default, and shut them down, when exiting. Behaviour of the guardian
in case of the instance crash has changed. Now it tries to restart an instance constantly in the first 2
seconds after the crash was noticed, and then it tries restart an instance once in the MONITORING_INTERVAL.
If it failed to restart instance for "restart_retry" (compiled-in value) times, guardian stops trying to
restart it.
server-tools/instance-manager/guardian.h:
Several new functions and variables declared.
server-tools/instance-manager/instance.cc:
now start doesn't call stop(), but rather tries to remove the pidfile itself
server-tools/instance-manager/instance.h:
cleanup
server-tools/instance-manager/instance_map.cc:
no more "admin" options
server-tools/instance-manager/instance_map.h:
User and password purged from instance_map options, as IM shouldn't know them
server-tools/instance-manager/instance_options.cc:
new option added -- shutdown_delay, guarded option now called nonguaded and has the opposite meaning
server-tools/instance-manager/instance_options.h:
appropriate changes, reflecting options addition/removal
server-tools/instance-manager/manager.cc:
shutdown process is complicated a bit -- at first signal thread should stop guardian, and only then the IM
itself
server-tools/instance-manager/messages.cc:
update error message
server-tools/instance-manager/options.cc:
admin user/password purged from mysqlmanager options
2005-01-31 21:54:08 +01:00
|
|
|
{"--nonguarded", 9, &nonguarded, SAVE_WHOLE},
|
|
|
|
{"--shutdown_delay", 9, &shutdown_delay, SAVE_VALUE},
|
2004-11-02 08:11:03 +01:00
|
|
|
{NULL, 0, NULL, 0}
|
|
|
|
};
|
|
|
|
struct selected_options_st *selected_options;
|
2004-10-23 09:32:52 +02:00
|
|
|
|
2004-11-02 08:11:03 +01:00
|
|
|
if (!(tmp= strdup_root(&alloc, option)))
|
|
|
|
goto err;
|
2004-10-23 09:32:52 +02:00
|
|
|
|
2004-11-02 08:11:03 +01:00
|
|
|
for (selected_options= options; selected_options->name; selected_options++)
|
|
|
|
{
|
|
|
|
if (!strncmp(tmp, selected_options->name, selected_options->length))
|
|
|
|
switch(selected_options->type){
|
|
|
|
case SAVE_WHOLE_AND_ADD:
|
|
|
|
*(selected_options->value)= tmp;
|
|
|
|
insert_dynamic(&options_array,(gptr) &tmp);
|
|
|
|
return 0;
|
|
|
|
case SAVE_VALUE:
|
|
|
|
*(selected_options->value)= strchr(tmp, '=') + 1;
|
|
|
|
return 0;
|
|
|
|
case SAVE_WHOLE:
|
|
|
|
*(selected_options->value)= tmp;
|
|
|
|
return 0;
|
|
|
|
defaut:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2004-10-23 09:32:52 +02:00
|
|
|
|
2005-02-05 08:15:34 +01:00
|
|
|
/* if we haven't returned earlier we should just save the option */
|
|
|
|
insert_dynamic(&options_array,(gptr) &tmp);
|
|
|
|
|
2004-10-23 09:32:52 +02:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
err:
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2004-11-02 08:11:03 +01:00
|
|
|
|
2004-10-23 09:32:52 +02:00
|
|
|
int Instance_options::add_to_argv(const char* option)
|
|
|
|
{
|
2004-10-25 12:23:31 +02:00
|
|
|
DBUG_ASSERT(filled_default_options < MAX_NUMBER_OF_DEFAULT_OPTIONS);
|
2004-10-23 09:32:52 +02:00
|
|
|
|
2005-02-27 16:41:34 +01:00
|
|
|
if ((option))
|
2005-05-15 23:54:02 +02:00
|
|
|
argv[filled_default_options++]= (char*) option;
|
2004-10-23 09:32:52 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-02-11 12:21:59 +01:00
|
|
|
|
|
|
|
/* function for debug purposes */
|
2005-02-03 18:48:58 +01:00
|
|
|
void Instance_options::print_argv()
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
printf("printing out an instance %s argv:\n", instance_name);
|
|
|
|
for (i=0; argv[i] != NULL; i++)
|
|
|
|
{
|
|
|
|
printf("argv: %s\n", argv[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-10-23 09:32:52 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
We execute this function to initialize some options.
|
|
|
|
Return value: 0 - ok. 1 - unable to allocate memory.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int Instance_options::init(const char *instance_name_arg)
|
|
|
|
{
|
|
|
|
instance_name_len= strlen(instance_name_arg);
|
|
|
|
|
|
|
|
init_alloc_root(&alloc, MEM_ROOT_BLOCK_SIZE, 0);
|
|
|
|
|
2005-05-15 23:54:02 +02:00
|
|
|
if (my_init_dynamic_array(&options_array, sizeof(char*), 0, 32))
|
2004-11-02 08:11:03 +01:00
|
|
|
goto err;
|
2004-10-23 09:32:52 +02:00
|
|
|
|
2005-05-15 23:54:02 +02:00
|
|
|
if (!(instance_name= strmake_root(&alloc, (char*) instance_name_arg,
|
2004-10-23 09:32:52 +02:00
|
|
|
instance_name_len)))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err:
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Instance_options::~Instance_options()
|
|
|
|
{
|
|
|
|
free_root(&alloc, MYF(0));
|
|
|
|
delete_dynamic(&options_array);
|
|
|
|
}
|
|
|
|
|