diff options
| author | Mats Kindahl <mats.kindahl@oracle.com> | 2010-08-16 14:50:27 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats.kindahl@oracle.com> | 2010-08-16 14:50:27 +0200 |
| commit | b0836bd309e5b7857771ccae7096f0fdcdfc58e2 (patch) | |
| tree | 60ab98cb19a6a71445b167b4cbc5308f59767cc9 /vio/vio.c | |
| parent | 0ea3fb557deb017cd96f1e57694d56a5ace8c80c (diff) | |
| parent | 7017775fd11c4249c1b64ff45564c88b94cf526f (diff) | |
| download | mariadb-git-b0836bd309e5b7857771ccae7096f0fdcdfc58e2.tar.gz | |
Merging with mysql-5.5-stage.
Diffstat (limited to 'vio/vio.c')
| -rw-r--r-- | vio/vio.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/vio/vio.c b/vio/vio.c index 67704a56b22..48f103c33e8 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -44,6 +44,11 @@ static my_bool no_poll_read(Vio *vio __attribute__((unused)), #endif +static my_bool has_no_data(Vio *vio __attribute__((unused))) +{ + return FALSE; +} + /* * Helper to fill most of the Vio* with defaults. */ @@ -83,6 +88,7 @@ static void vio_init(Vio* vio, enum enum_vio_type type, vio->poll_read =no_poll_read; vio->is_connected =vio_is_connected_pipe; + vio->has_data =has_no_data; vio->timeout=vio_win32_timeout; /* Set default timeout */ @@ -110,6 +116,7 @@ static void vio_init(Vio* vio, enum enum_vio_type type, vio->poll_read =no_poll_read; vio->is_connected =vio_is_connected_shared_memory; + vio->has_data =has_no_data; /* Currently, shared memory is on Windows only, hence the below is ok*/ vio->timeout= vio_win32_timeout; @@ -137,6 +144,7 @@ static void vio_init(Vio* vio, enum enum_vio_type type, vio->timeout =vio_timeout; vio->poll_read =vio_poll_read; vio->is_connected =vio_is_connected; + vio->has_data =vio_ssl_has_data; DBUG_VOID_RETURN; } #endif /* HAVE_OPENSSL */ @@ -155,6 +163,8 @@ static void vio_init(Vio* vio, enum enum_vio_type type, vio->timeout =vio_timeout; vio->poll_read =vio_poll_read; vio->is_connected =vio_is_connected; + vio->has_data= (flags & VIO_BUFFERED_READ) ? + vio_buff_has_data : has_no_data; DBUG_VOID_RETURN; } |