Merge mysql.com:/home/jimw/my/mysql-5.0-build

into mysql.com:/home/jimw/my/mysql-5.0-clean


mysys/default.c:
  Auto merged
server-tools/instance-manager/commands.cc:
  Auto merged

1 files changed, 3 insertions, 3 deletions

diff --git a/server-tools/instance-manager/commands.cc b/server-tools/instance-manager/commands.cc
index 347f435bbc1..77c26fd28de 100644
--- a/server-tools/instance-manager/commands.cc
+++ b/server-tools/instance-manager/commands.cc
@@ -573,9 +573,9 @@ int Show_instance_log_files::execute(struct st_net *net, ulong connection_id)
       const char *value;
     } logs[]=
     {
-      {"ERROR LOG", instance->options.logs[LOG_ERROR]},
-      {"GENERAL LOG", instance->options.logs[LOG_GENERAL]},
-      {"SLOW LOG", instance->options.logs[LOG_SLOW]},
+      {"ERROR LOG", instance->options.logs[IM_LOG_ERROR]},
+      {"GENERAL LOG", instance->options.logs[IM_LOG_GENERAL]},
+      {"SLOW LOG", instance->options.logs[IM_LOG_SLOW]},
       {NULL, NULL}
     };
     struct log_files_st *log_files;