diff options
| author | hf@deer.(none) <> | 2005-01-11 21:00:53 +0400 |
|---|---|---|
| committer | hf@deer.(none) <> | 2005-01-11 21:00:53 +0400 |
| commit | 196c95e938ecced55a9fb0931fb5c9fb564d6866 (patch) | |
| tree | a016853c9385e1555657e606886d3588657139ab /include | |
| parent | ee72592bfddf9522d1d08db5daf4e12e78f22661 (diff) | |
| parent | 2bd854c859c347156c39171d3d82e96608b87068 (diff) | |
| download | mariadb-git-196c95e938ecced55a9fb0931fb5c9fb564d6866.tar.gz | |
Merging conflicts resolved
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index cbcd6f0f833..5b0390c7d72 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -769,6 +769,8 @@ extern void reset_root_defaults(MEM_ROOT *mem_root, uint block_size, extern char *strdup_root(MEM_ROOT *root,const char *str); extern char *strmake_root(MEM_ROOT *root,const char *str,uint len); extern char *memdup_root(MEM_ROOT *root,const char *str,uint len); +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, |