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

Cleanup: manually port the polishing parts from Alik's changeset for

Browse Source 
BUG#22306: STOP INSTANCE can not be applied for instances in Crashed,
Failed and Abandoned
This commit is contained in:
kostja@bodhi.local
2006-11-16 23:36:20 +03:00
parent e8d51e62bb
commit 2f69dfb28f
21 changed files with 205 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,7 +269,7 @@ void skip_spaces(const char **text)
}
Command *parse_command(Instance_map *map, const char *text)
Command *parse_command(const char *text)
{
uint word_len;
LEX_STRING instance_name;
@ -294,7 +294,7 @@ Command *parse_command(Instance_map *map, const char *text)
if (tok1 == TOK_CREATE)
{
Create_instance *cmd= new Create_instance(map, &instance_name);
Create_instance *cmd= new Create_instance(&instance_name);
if (!cmd)
return NULL; /* Report ER_OUT_OF_RESOURCES. */
@ -317,16 +317,16 @@ Command *parse_command(Instance_map *map, const char *text)
switch (tok1) {
case TOK_START:
command= new Start_instance(map, &instance_name);
command= new Start_instance(&instance_name);
break;
case TOK_STOP:
command= new Stop_instance(map, &instance_name);
command= new Stop_instance(&instance_name);
break;
case TOK_CREATE:
; /* command already initialized. */
break;
case TOK_DROP:
command= new Drop_instance(map, &instance_name);
command= new Drop_instance(&instance_name);
break;
default: /* this is impossible, but nevertheless... */
DBUG_ASSERT(0);
@ -340,7 +340,7 @@ Command *parse_command(Instance_map *map, const char *text)
if (word_len)
goto syntax_error;
command= new Flush_instances(map);
command= new Flush_instances();
break;
case TOK_UNSET:
case TOK_SET:
@ -348,9 +348,9 @@ Command *parse_command(Instance_map *map, const char *text)
Abstract_option_cmd *cmd;
if (tok1 == TOK_SET)
cmd= new Set_option(map);
cmd= new Set_option();
else
cmd= new Unset_option(map);
cmd= new Unset_option();
if (!cmd)
return NULL; /* Report ER_OUT_OF_RESOURCES. */
@ -371,7 +371,7 @@ Command *parse_command(Instance_map *map, const char *text)
get_word(&text, &word_len, NONSPACE);
if (word_len)
goto syntax_error;
command= new Show_instances(map);
command= new Show_instances();
break;
case TOK_INSTANCE:
switch (Token tok2= shift_token(&text, &word_len)) {
@ -385,9 +385,9 @@ Command *parse_command(Instance_map *map, const char *text)
if (word_len)
goto syntax_error;
if (tok2 == TOK_STATUS)
command= new Show_instance_status(map, &instance_name);
command= new Show_instance_status(&instance_name);
else
command= new Show_instance_options(map, &instance_name);
command= new Show_instance_options(&instance_name);
break;
default:
goto syntax_error;
@ -414,7 +414,7 @@ Command *parse_command(Instance_map *map, const char *text)
/* check that this is the end of the command */
if (word_len)
goto syntax_error;
command= new Show_instance_log_files(map, &instance_name);
command= new Show_instance_log_files(&instance_name);
break;
case TOK_ERROR:
case TOK_GENERAL:
@ -484,7 +484,7 @@ Command *parse_command(Instance_map *map, const char *text)
goto syntax_error;
}
command= new Show_instance_log(map, &instance_name,
command= new Show_instance_log(&instance_name,
log_type, log_size, log_offset);
break;
default:
@ -504,5 +504,8 @@ Command *parse_command(Instance_map *map, const char *text)
syntax_error:
command= new Syntax_error();
}
DBUG_ASSERT(command);
return command;
}