summaryrefslogtreecommitdiff
path: root/server-tools
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 /server-tools
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 'server-tools')
-rw-r--r--server-tools/instance-manager/commands.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/server-tools/instance-manager/commands.cc b/server-tools/instance-manager/commands.cc
index fd346148df2..347f435bbc1 100644
--- a/server-tools/instance-manager/commands.cc
+++ b/server-tools/instance-manager/commands.cc
@@ -689,8 +689,8 @@ int Set_option::correct_file(int skip)
{
int error;
- error= my_correct_defaults_file("/etc/my.cnf", option,
- option_value, instance_name, skip);
+ error= modify_defaults_file("/etc/my.cnf", option,
+ option_value, instance_name, skip);
if (error > 0)
return ER_OUT_OF_RESOURCES;
else if (error < 0)