database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

commands.cc, parse.h, parse.cc, instance_options.cc:

Browse Source 
Prefix enum symbols LOG_* with IM_, not to clash with system headers
This commit is contained in:
kent@mysql.com
2005-05-18 12:34:38 +02:00
parent 7b524409e6
commit 72ce7299a9
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server-tools/instance-manager/commands.cc
View File

@ -573,9 +573,9 @@ int Show_instance_log_files::execute(struct st_net *net, ulong connection_id)
const char *value; const char *value;
} logs[]= } logs[]=
{ {
{"ERROR LOG", instance->options.logs[LOG_ERROR]}, {"ERROR LOG", instance->options.logs[IM_LOG_ERROR]},
{"GENERAL LOG", instance->options.logs[LOG_GENERAL]}, {"GENERAL LOG", instance->options.logs[IM_LOG_GENERAL]},
{"SLOW LOG", instance->options.logs[LOG_SLOW]}, {"SLOW LOG", instance->options.logs[IM_LOG_SLOW]},
{NULL, NULL} {NULL, NULL}
}; };
struct log_files_st *log_files; struct log_files_st *log_files;

6
server-tools/instance-manager/instance_options.cc
View File

@ -111,9 +111,9 @@ int Instance_options::fill_log_options()
const char *default_suffix; const char *default_suffix;
} logs_st[]= } logs_st[]=
{ {
{"--log-error", 11, &(logs[LOG_ERROR]), ".err"}, {"--log-error", 11, &(logs[IM_LOG_ERROR]), ".err"},
{"--log", 5, &(logs[LOG_GENERAL]), ".log"}, {"--log", 5, &(logs[IM_LOG_GENERAL]), ".log"},
{"--log-slow-queries", 18, &(logs[LOG_SLOW]), "-slow.log"}, {"--log-slow-queries", 18, &(logs[IM_LOG_SLOW]), "-slow.log"},
{NULL, 0, NULL, NULL} {NULL, 0, NULL, NULL}
}; };
struct log_files_st *log_files; struct log_files_st *log_files;

6
server-tools/instance-manager/parse.cc
View File

@ -262,13 +262,13 @@ Command *parse_command(Command_factory *factory, const char *text)
/* define a log type */ /* define a log type */
switch (tok3) { switch (tok3) {
case TOK_ERROR: case TOK_ERROR:
log_type= LOG_ERROR; log_type= IM_LOG_ERROR;
break; break;
case TOK_GENERAL: case TOK_GENERAL:
log_type= LOG_GENERAL; log_type= IM_LOG_GENERAL;
break; break;
case TOK_SLOW: case TOK_SLOW:
log_type= LOG_SLOW; log_type= IM_LOG_SLOW;
break; break;
default: default:
goto syntax_error; goto syntax_error;

6
server-tools/instance-manager/parse.h
View File

@ -24,9 +24,9 @@ class Command_factory;
enum Log_type enum Log_type
{ {
LOG_ERROR= 0, IM_LOG_ERROR= 0,
LOG_GENERAL, IM_LOG_GENERAL,
LOG_SLOW IM_LOG_SLOW
}; };
Command *parse_command(Command_factory *factory, const char *text); Command *parse_command(Command_factory *factory, const char *text);