diff options
| author | unknown <petr@mysql.com> | 2006-02-18 18:00:22 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2006-02-18 18:00:22 +0300 |
| commit | ff94b12491cb6b71e840a6a91769d35617dcc1c3 (patch) | |
| tree | 5f23def125a751c30d48e207333553ffaf6db9a8 /server-tools | |
| parent | 9dadc39fb5d718381c70aaca0721be8c76a45160 (diff) | |
| parent | 187aab97b6936ed88b5021de0bc0ae342ac991c8 (diff) | |
| download | mariadb-git-ff94b12491cb6b71e840a6a91769d35617dcc1c3.tar.gz | |
Merge mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message
into mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-debug
mysql-test/r/im_life_cycle.result:
Auto merged
mysql-test/t/im_life_cycle.imtest:
Auto merged
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/parse.cc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/server-tools/instance-manager/parse.cc b/server-tools/instance-manager/parse.cc index 9d9064240d4..14b3db16b45 100644 --- a/server-tools/instance-manager/parse.cc +++ b/server-tools/instance-manager/parse.cc @@ -143,7 +143,7 @@ Command *parse_command(Instance_map *map, const char *text) instance_name_len= word_len; text+= word_len; /* it should be the end of command */ - get_word(&text, &word_len); + get_word(&text, &word_len, NONSPACE); if (word_len) goto syntax_error; @@ -156,7 +156,7 @@ Command *parse_command(Instance_map *map, const char *text) if (shift_token(&text, &word_len) != TOK_INSTANCES) goto syntax_error; - get_word(&text, &word_len); + get_word(&text, &word_len, NONSPACE); if (word_len) goto syntax_error; @@ -197,7 +197,7 @@ Command *parse_command(Instance_map *map, const char *text) } /* should be empty */ - get_word(&text, &word_len); + get_word(&text, &word_len, NONSPACE); if (word_len) goto syntax_error; @@ -213,7 +213,7 @@ Command *parse_command(Instance_map *map, const char *text) case TOK_SHOW: switch (shift_token(&text, &word_len)) { case TOK_INSTANCES: - get_word(&text, &word_len); + get_word(&text, &word_len, NONSPACE); if (word_len) goto syntax_error; command= new Show_instances(map); @@ -226,7 +226,7 @@ Command *parse_command(Instance_map *map, const char *text) goto syntax_error; text+= instance_name_len; /* check that this is the end of the command */ - get_word(&text, &word_len); + get_word(&text, &word_len, NONSPACE); if (word_len) goto syntax_error; if (tok2 == TOK_STATUS) @@ -250,7 +250,7 @@ Command *parse_command(Instance_map *map, const char *text) case TOK_LOG: switch (Token tok3= shift_token(&text, &word_len)) { case TOK_FILES: - get_word(&text, &word_len); + get_word(&text, &word_len, NONSPACE); /* check that this is the end of the command */ if (word_len) goto syntax_error; @@ -290,10 +290,14 @@ Command *parse_command(Instance_map *map, const char *text) get_word(&text, &word_len); if (!word_len) goto syntax_error; + text+= word_len; command= new Show_instance_log(map, instance_name, instance_name_len, log_type, log_size, text); - + get_word(&text, &word_len, NONSPACE); + /* check that this is the end of the command */ + if (word_len) + goto syntax_error; break; case '\0': command= new Show_instance_log(map, instance_name, |