New file default_modify.c. Fixed a typo on mysqld.cc

Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it.


include/my_sys.h:
  Changed function name.
include/mysql_com.h:
  New function, modify_defaults_file()
libmysql/Makefile.shared:
  New file, default_modify.lo
libmysql/libmysql.def:
  New function, modify_defaults_file() and fixed version number.
libmysqld/libmysqld.def:
  New function, modify_defaults_file()
mysys/Makefile.am:
  New file, default_modify.c
mysys/default.c:
  Removed function from default.c. New, corresponding one is in default_modify.c,
  name is modify_defaults_file.
server-tools/instance-manager/commands.cc:
  Changed function name.
sql/mysqld.cc:
  Fixed typo.

2 files changed, 6 insertions, 5 deletions

diff --git a/include/my_sys.h b/include/my_sys.h
index a744a71ba6e..9c07fc2e923 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -778,15 +778,13 @@ 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,
 			 int *argc, char ***argv);
+extern uint modify_defaults_file(const char *file_location, const char *option,
+				 const char *option_value,
+				 const char *section_name, int remove_option);
 extern int my_search_option_files(const char *conf_file, int *argc,
                                   char ***argv, uint *args_used,
                                   Process_option_func func, void *func_ctx);
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 5a7b99fc3d8..a49bc01da8a 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -417,6 +417,9 @@ const char *mysql_errno_to_sqlstate(unsigned int mysql_errno);
 /* Some other useful functions */
 
 my_bool my_init(void);
+extern uint modify_defaults_file(const char *file_location, const char *option,
+				 const char *option_value,
+				 const char *section_name, int remove_option);
 int load_defaults(const char *conf_file, const char **groups,
 		  int *argc, char ***argv);
 my_bool my_thread_init(void);