Commit a2cfc204 authored by unknown's avatar unknown

Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0

into hundin.mysql.fi:/home/marko/mysql-5.0

parents 5a295d7a c36f737d
...@@ -752,7 +752,7 @@ static void cli_flush_use_result(MYSQL *mysql) ...@@ -752,7 +752,7 @@ static void cli_flush_use_result(MYSQL *mysql)
{ {
if (protocol_41(mysql)) if (protocol_41(mysql))
{ {
char *pos= (char*) mysql->net.read_pos; char *pos= (char*) mysql->net.read_pos + 1;
mysql->warning_count=uint2korr(pos); pos+=2; mysql->warning_count=uint2korr(pos); pos+=2;
mysql->server_status=uint2korr(pos); pos+=2; mysql->server_status=uint2korr(pos); pos+=2;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment