Commit a2cfc204 authored by unknown's avatar unknown
Browse files

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

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

parents 5a295d7a c36f737d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ static void cli_flush_use_result(MYSQL *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->server_status=uint2korr(pos); pos+=2;
      }