diff options
-rw-r--r-- | client/mysqltest.c | 8 | ||||
-rw-r--r-- | mysql-test/t/mysqltest.test | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index a8518c4363a..d11b5379d97 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -4806,9 +4806,13 @@ int read_command(struct st_command** command_ptr) if (!(command->query_buf= command->query= my_strdup(p, MYF(MY_WME)))) die("Out of memory"); - /* Calculate first word and first argument */ - for (p= command->query; *p && !my_isspace(charset_info, *p) ; p++) ; + /* Calculate first word length(the command), terminated by space or ( */ + p= command->query; + while (*p && !my_isspace(charset_info, *p) && *p != '(') + p++; command->first_word_len= (uint) (p - command->query); + DBUG_PRINT("info", ("first_word: %.*s", + command->first_word_len, command->query)); /* Skip spaces between command and first argument */ while (*p && my_isspace(charset_info, *p)) diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 017911e00a5..661fd302a1e 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -974,7 +974,7 @@ if (!$counter) echo Counter is not 0, (counter=10); } let $counter=0; -if ($counter) +if($counter) { echo Counter is greater than 0, (counter=0); } |