diff options
| author | unknown <petr@mysql.com> | 2005-02-18 14:58:30 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-02-18 14:58:30 +0300 |
| commit | e2d78b85bf004c8c0ec25165d0c9980a3253914a (patch) | |
| tree | e70177c55262e4cf9599d161b38fb2b72ffb2a8b /include | |
| parent | 31bec292632fb0b77ef20804fea334474e07e326 (diff) | |
| download | mariadb-git-e2d78b85bf004c8c0ec25165d0c9980a3253914a.tar.gz | |
made IM to work with --defaults-file smoothly
BitKeeper/deleted/.del-my.cnf~9322f78f12eb2f3c:
Delete: support-files/my.cnf
include/my_sys.h:
fixed prototype to reflect changes in default.c
mysys/default.c:
use my_search_option_files instead of process_default_option_files. This is used from the IM.
server-tools/instance-manager/instance.cc:
added parameter to complete_initialization(). this ine marks whether we are creating the only instance
(for instance, when no config file given)
server-tools/instance-manager/instance.h:
prototype changed
server-tools/instance-manager/instance_map.cc:
Now call my_search_option_files to work smootly with --defaults-file
server-tools/instance-manager/instance_map.h:
added first_option member. This is set of mysqlmanager was started with --defaults-file or with
--extra-defaults-file to be passed to the my_search_option_files
server-tools/instance-manager/instance_options.cc:
if we have only one instance, name the pidfile `hostname`.pid for compatibility reasons.
server-tools/instance-manager/instance_options.h:
header fixed according to .cc
server-tools/instance-manager/manager.cc:
prototype fixed
server-tools/instance-manager/options.cc:
save --defaults-file of --defaults-extra-file to pass it to my_search_option_files
server-tools/instance-manager/options.h:
added an optin to save --default-file options
support-files/Makefile.am:
revert changes
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 72d4bec74b1..7d3b402bc6f 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -531,7 +531,7 @@ typedef uint32 ha_checksum; /* Define the type of function to be passed to process_default_option_files */ typedef int (*Process_option_func)(void *ctx, const char *group_name, - const char *option); + const char *option); #include <my_alloc.h> @@ -776,9 +776,9 @@ extern void get_defaults_files(int argc, char **argv, char **defaults, char **extra_defaults); extern int load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv); -extern int process_default_option_files(const char *conf_file, - Process_option_func func, - void *func_ctx); +extern int my_search_option_files(const char *conf_file, int *argc, + char ***argv, uint *args_used, + Process_option_func func, void *func_ctx); extern void free_defaults(char **argv); extern void print_defaults(const char *conf_file, const char **groups); extern my_bool my_compress(byte *, ulong *, ulong *); |