summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarko@hundin.mysql.fi <>2005-02-17 21:45:14 +0200
committermarko@hundin.mysql.fi <>2005-02-17 21:45:14 +0200
commit15ddb5c4ca9fe3e63d792da50a81cf1bca1e2544 (patch)
treed19fe37ab2385117302b1651bed76a8001052cc1
parente1d4e17b4ce4dd9598b520f1bd51dde444d37392 (diff)
parent3bc92ed9f5ff18e743770040dd9e39e266309ace (diff)
downloadmariadb-git-15ddb5c4ca9fe3e63d792da50a81cf1bca1e2544.tar.gz
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0
-rw-r--r--sql-common/client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 9dcf6b3e32c..cca1452d710 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -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;
}