diff options
| author | jimw@mysql.com <> | 2005-05-18 17:13:31 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-05-18 17:13:31 -0700 |
| commit | 6757a04e4c751c8f75f539ac036b21210b918944 (patch) | |
| tree | c740a12e239b2b930d23bdca85357315f1680f5a /server-tools | |
| parent | ae52de495a2248a37086352479eb57b43a5e90a6 (diff) | |
| parent | 2b5f9fad811752c93580ae90ac37313ade345b7c (diff) | |
| download | mariadb-git-6757a04e4c751c8f75f539ac036b21210b918944.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-build
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/commands.cc | 6 | ||||
| -rw-r--r-- | server-tools/instance-manager/instance_options.cc | 6 | ||||
| -rw-r--r-- | server-tools/instance-manager/parse.cc | 6 | ||||
| -rw-r--r-- | server-tools/instance-manager/parse.h | 6 |
4 files changed, 12 insertions, 12 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; diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc index b2602af6066..c8288c35a6f 100644 --- a/server-tools/instance-manager/instance_options.cc +++ b/server-tools/instance-manager/instance_options.cc @@ -111,9 +111,9 @@ int Instance_options::fill_log_options() const char *default_suffix; } logs_st[]= { - {"--log-error", 11, &(logs[LOG_ERROR]), ".err"}, - {"--log", 5, &(logs[LOG_GENERAL]), ".log"}, - {"--log-slow-queries", 18, &(logs[LOG_SLOW]), "-slow.log"}, + {"--log-error", 11, &(logs[IM_LOG_ERROR]), ".err"}, + {"--log", 5, &(logs[IM_LOG_GENERAL]), ".log"}, + {"--log-slow-queries", 18, &(logs[IM_LOG_SLOW]), "-slow.log"}, {NULL, 0, NULL, NULL} }; struct log_files_st *log_files; diff --git a/server-tools/instance-manager/parse.cc b/server-tools/instance-manager/parse.cc index fae69375b61..ed3bfd6bba0 100644 --- a/server-tools/instance-manager/parse.cc +++ b/server-tools/instance-manager/parse.cc @@ -262,13 +262,13 @@ Command *parse_command(Command_factory *factory, const char *text) /* define a log type */ switch (tok3) { case TOK_ERROR: - log_type= LOG_ERROR; + log_type= IM_LOG_ERROR; break; case TOK_GENERAL: - log_type= LOG_GENERAL; + log_type= IM_LOG_GENERAL; break; case TOK_SLOW: - log_type= LOG_SLOW; + log_type= IM_LOG_SLOW; break; default: goto syntax_error; diff --git a/server-tools/instance-manager/parse.h b/server-tools/instance-manager/parse.h index 0cfa33723c9..7d13691e7eb 100644 --- a/server-tools/instance-manager/parse.h +++ b/server-tools/instance-manager/parse.h @@ -24,9 +24,9 @@ class Command_factory; enum Log_type { - LOG_ERROR= 0, - LOG_GENERAL, - LOG_SLOW + IM_LOG_ERROR= 0, + IM_LOG_GENERAL, + IM_LOG_SLOW }; Command *parse_command(Command_factory *factory, const char *text); |