diff options
| author | unknown <petr@mysql.com> | 2005-05-16 03:01:05 +0400 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-05-16 03:01:05 +0400 |
| commit | 577f140e3f0010c2a50c988f523d66b9d5d27303 (patch) | |
| tree | 56d4f80052ccf888c59433be52b8ea30b5a79fb1 /include | |
| parent | 04b56a3efabc24e721cd2438b5df9f9585634cc6 (diff) | |
| parent | 6b4dbcb4db8236d5226284ff87af9126aa83f5b6 (diff) | |
| download | mariadb-git-577f140e3f0010c2a50c988f523d66b9d5d27303.tar.gz | |
Merge
include/my_sys.h:
Auto merged
libmysql/Makefile.shared:
Auto merged
mysys/default.c:
SCCS merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index f235b5a072e..a744a71ba6e 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -778,6 +778,11 @@ 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 int my_correct_defaults_file(const char *file_location, + const char *option, + const char *option_value, + const char *section_name, + int remove_option); 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, |