mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 192.168.0.7:mysql/mysql-5.0-maint

Browse source 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
This commit is contained in:
unknown 2007-08-08 18:03:56 +02:00
commit ff985f0690
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/mysqltest.c
View file

@ -4820,9 +4820,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))

2
mysql-test/t/mysqltest.test
View file

@ -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);
}