diff options
| author | unknown <jani@rhols221.adsl.netsonic.fi> | 2003-08-27 19:22:14 +0300 |
|---|---|---|
| committer | unknown <jani@rhols221.adsl.netsonic.fi> | 2003-08-27 19:22:14 +0300 |
| commit | 59de978b8938f4ce16bb314e5c17ae68270ebb6c (patch) | |
| tree | d7ed163d7a6f4b9665b75df0d91cc9848310fec3 /include | |
| parent | 9ed16ed13a7b5640cff4c888efefd6356df46fd5 (diff) | |
| download | mariadb-git-59de978b8938f4ce16bb314e5c17ae68270ebb6c.tar.gz | |
Added a warning to my_print_defaults if --verbose is given
and --defaults-file is a non-existing or non-regular file.
Bug#755
scripts/mysqld_safe.sh:
Added a warning to my_print_defaults if --verbose is given
and --defaults-file is a non-existing or non-regular file.
Bug#755
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 4 | ||||
| -rw-r--r-- | include/mysql_com.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 9f4b91c8bf6..7a3d22f3304 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -742,8 +742,8 @@ extern void set_prealloc_root(MEM_ROOT *root, char *ptr); 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 load_defaults(const char *conf_file, const char **groups, - int *argc, char ***argv); +extern int load_defaults(const char *conf_file, const char **groups, + int *argc, char ***argv); 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 *); diff --git a/include/mysql_com.h b/include/mysql_com.h index 945372563b0..6daf26bc2ac 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -242,8 +242,8 @@ void hash_password(unsigned long *result, const char *password); /* Some other useful functions */ void my_init(void); -void load_defaults(const char *conf_file, const char **groups, - int *argc, char ***argv); +int load_defaults(const char *conf_file, const char **groups, + int *argc, char ***argv); my_bool my_thread_init(void); void my_thread_end(void); |