diff options
| author | unknown <hf@deer.(none)> | 2005-01-11 19:58:52 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-01-11 19:58:52 +0400 |
| commit | 427bdc28ee59cb17f18738279727b48387345db2 (patch) | |
| tree | 095235bf3a804e1c93be2744d8bb43a05ba6091a /include | |
| parent | 4245f22b5672dc190a0ba4506eac78b35941426a (diff) | |
| parent | d3be3cbcfdf74f4131e16b201c7eb5dfde0a8257 (diff) | |
| download | mariadb-git-427bdc28ee59cb17f18738279727b48387345db2.tar.gz | |
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5920
client/mysql.cc:
Auto merged
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 a8e21ea2f98..5e56f0bdc2c 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -738,6 +738,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 void free_defaults(char **argv); |