diff options
author | monty@narttu.mysql.fi <> | 2007-08-14 00:22:34 +0300 |
---|---|---|
committer | monty@narttu.mysql.fi <> | 2007-08-14 00:22:34 +0300 |
commit | 9d609a59fdf6a13dd1fb615dca16957f359de62b (patch) | |
tree | 2641806010f25bf6469538558e05487ecff3c959 /vio | |
parent | 3ecef8c0b902b7ed213ba89ec3e8e5637033435e (diff) | |
parent | e53a73e26cf858ac48ead40927d84d54e33c1695 (diff) | |
download | mariadb-git-9d609a59fdf6a13dd1fb615dca16957f359de62b.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'vio')
-rw-r--r-- | vio/viosocket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index 5d8ca6d118c..942f0330c57 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -80,7 +80,7 @@ size_t vio_read_buff(Vio *vio, uchar* buf, size_t size) } else if (size < VIO_UNBUFFERED_READ_MIN_SIZE) { - rc= vio_read(vio, vio->read_buffer, VIO_READ_BUFFER_SIZE); + rc= vio_read(vio, (uchar*) vio->read_buffer, VIO_READ_BUFFER_SIZE); if (rc != 0 && rc != (size_t) -1) { if (rc > size) |