diff options
| author | unknown <tulin@dl145c.mysql.com> | 2005-05-18 22:26:23 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145c.mysql.com> | 2005-05-18 22:26:23 +0200 |
| commit | 024e1d1bce4a95555b6eff511094258a1f263352 (patch) | |
| tree | d7d25b0632c9a5473f4af7b1b2c772b0e543f694 /server-tools | |
| parent | 2fe8cc51aad5fb7958a90ea8be3667f1e23b0ea5 (diff) | |
| parent | 6f7bccd1aca31045e2678159e2e931d2e94f54dd (diff) | |
| download | mariadb-git-024e1d1bce4a95555b6eff511094258a1f263352.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
BUILD/compile-alpha-cxx:
Auto merged
BUILD/compile-alpha-debug:
Auto merged
configure.in:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 3 | ||||
| -rw-r--r-- | server-tools/instance-manager/commands.cc | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index 18f62a04bfb..2788aef8f82 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -14,7 +14,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -INCLUDES= -I$(top_srcdir)/include -I$(top_builddir)/include +INCLUDES= @ZLIB_INCLUDES@ -I$(top_srcdir)/include \ + $(openssl_includes) -I$(top_builddir)/include DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER diff --git a/server-tools/instance-manager/commands.cc b/server-tools/instance-manager/commands.cc index d6d4370fb7f..347f435bbc1 100644 --- a/server-tools/instance-manager/commands.cc +++ b/server-tools/instance-manager/commands.cc @@ -548,7 +548,7 @@ int Show_instance_log_files::execute(struct st_net *net, ulong connection_id) path_field.name= (char*) "Path"; path_field.length= DEFAULT_FIELD_LENGTH; path.data= &path_field; - size_field.name= (char*) "Filesize"; + size_field.name= (char*) "File size"; size_field.length= DEFAULT_FIELD_LENGTH; size.data= &size_field; field_list= list_add(NULL, &size); @@ -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) |