1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change the return type back to int (modify_defaults_file).

Browse Source 
This fixes a compilation failure in mysql_com.h, which doesn't have
'uint' alias visibile. Maybe worth while changing to unsigned int, but
the rest of functions that work with defaults files return int.


include/my_sys.h:
  Change the return type back to int (modify_defaults_file).
include/mysql_com.h:
  Change the return type back to int (modify_defaults_file).
mysys/default_modify.c:
  Change the return type back to int (modify_defaults_file).
This commit is contained in:
unknown 2005-05-19 14:02:12 +04:00
parent 2525722245
commit f87f045065
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/my_sys.h
View File

@ -782,7 +782,7 @@ extern void get_defaults_files(int argc, char **argv,
char **defaults, char **extra_defaults); char **defaults, char **extra_defaults);
extern int load_defaults(const char *conf_file, const char **groups, extern int load_defaults(const char *conf_file, const char **groups,
int *argc, char ***argv); int *argc, char ***argv);
extern uint modify_defaults_file(const char *file_location, const char *option, extern int modify_defaults_file(const char *file_location, const char *option,
const char *option_value, const char *option_value,
const char *section_name, int remove_option); const char *section_name, int remove_option);
extern int my_search_option_files(const char *conf_file, int *argc, extern int my_search_option_files(const char *conf_file, int *argc,

2
include/mysql_com.h
View File

@ -417,7 +417,7 @@ const char *mysql_errno_to_sqlstate(unsigned int mysql_errno);
/* Some other useful functions */ /* Some other useful functions */
my_bool my_init(void); my_bool my_init(void);
extern uint modify_defaults_file(const char *file_location, const char *option, extern int modify_defaults_file(const char *file_location, const char *option,
const char *option_value, const char *option_value,
const char *section_name, int remove_option); const char *section_name, int remove_option);
int load_defaults(const char *conf_file, const char **groups, int load_defaults(const char *conf_file, const char **groups,

2
mysys/default_modify.c
View File

@ -37,7 +37,7 @@
#define NEWLINE_LEN 1 #define NEWLINE_LEN 1
#endif #endif
uint modify_defaults_file(const char *file_location, const char *option, int modify_defaults_file(const char *file_location, const char *option,
const char *option_value, const char *option_value,
const char *section_name, int remove_option) const char *section_name, int remove_option)
{ {