Commit 48ce8aeb authored by unknown's avatar unknown
Browse files

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.
parent 40772ccc

include/my_sys.h

+3 −5
Original line number Diff line number Diff line
@@ -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);

include/mysql_com.h

+3 −0
Original line number Diff line number Diff line
@@ -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);

libmysql/Makefile.shared

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ 
			mf_format.lo mf_path.lo mf_unixpath.lo my_fopen.lo \

			my_symlink.lo my_fstream.lo \

			mf_loadpath.lo my_pthread.lo my_thr_init.lo \

			thr_mutex.lo mulalloc.lo string.lo default.lo \

			thr_mutex.lo mulalloc.lo string.lo \

                        default.lo default_modify.lo \

			my_compress.lo array.lo my_once.lo list.lo my_net.lo \

                        charset.lo charset-def.lo hash.lo mf_iocache.lo \

                        mf_iocache2.lo my_seek.lo my_sleep.lo \

libmysql/libmysql.def

+2 −1
Original line number Diff line number Diff line 
LIBRARY		LIBMYSQL

DESCRIPTION	'MySQL 4.1 Client Library'

DESCRIPTION	'MySQL 5.0 Client Library'

VERSION		6.0

EXPORTS

	_dig_vec_lower
@@ -150,3 +150,4 @@ EXPORTS 
	mysql_server_end

	mysql_set_character_set

	get_defaults_files

	modify_defaults_file

libmysqld/libmysqld.def

+1 −0
Original line number Diff line number Diff line
@@ -160,3 +160,4 @@ EXPORTS 
	get_defaults_files

	my_charset_bin

	my_charset_same

	modify_defaults_file