Commit a5949c84 authored by unknown's avatar unknown

Change the return type back to int (modify_defaults_file).

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).
parent 6147e079
...@@ -782,9 +782,9 @@ extern void get_defaults_files(int argc, char **argv, ...@@ -782,9 +782,9 @@ 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,
char ***argv, uint *args_used, char ***argv, uint *args_used,
Process_option_func func, void *func_ctx); Process_option_func func, void *func_ctx);
......
...@@ -417,9 +417,9 @@ const char *mysql_errno_to_sqlstate(unsigned int mysql_errno); ...@@ -417,9 +417,9 @@ 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,
int *argc, char ***argv); int *argc, char ***argv);
my_bool my_thread_init(void); my_bool my_thread_init(void);
......
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
#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)
{ {
FILE *cnf_file; FILE *cnf_file;
struct stat file_stat; struct stat file_stat;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment