summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <jani@a193-229-222-105.elisa-laajakaista.fi>2005-05-18 20:10:17 +0300
committerunknown <jani@a193-229-222-105.elisa-laajakaista.fi>2005-05-18 20:10:17 +0300
commit48ce8aebd5800c605d6ff040f50bcf1fc12e6538 (patch)
treee57ae27a7201529c3dae9ffc542a5cae155f4f12 /libmysql
parent40772cccb3fcf9c87ba12159a0eaff3ea039a93f (diff)
downloadmariadb-git-48ce8aebd5800c605d6ff040f50bcf1fc12e6538.tar.gz
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.
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/Makefile.shared3
-rw-r--r--libmysql/libmysql.def3
2 files changed, 4 insertions, 2 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared
index bcd2ec6c057..a2bfa616f6b 100644
--- a/libmysql/Makefile.shared
+++ b/libmysql/Makefile.shared
@@ -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 \
diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def
index 4c7a8352fb4..2da88c271ba 100644
--- a/libmysql/libmysql.def
+++ b/libmysql/libmysql.def
@@ -1,5 +1,5 @@
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