diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-10 17:36:38 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-10 17:36:38 -0200 |
| commit | 5783428f3b3fd8fbae5b9923cb942f3916011f32 (patch) | |
| tree | cd2a6e4896a743f9dc89d6b6b5273f487ba04ccb /sql/item_func.cc | |
| parent | 58706b3f7d73b1b1c5fce40b1296670d4e6d3ddf (diff) | |
| download | mariadb-git-5783428f3b3fd8fbae5b9923cb942f3916011f32.tar.gz | |
Backport of Bug#41860 to mysql-next-mr
------------------------------------------------------------
revno: 3317
revision-id: davi.arnaut@sun.com-20090522170916-fzc5ca3tjs9roy1t
parent: patrick.crews@sun.com-20090522152933-ole8s3suy4zqyvku
committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
branch nick: 41860-6.0
timestamp: Fri 2009-05-22 14:09:16 -0300
message:
Bug#41860: Without Windows named pipe
The problem was that the patch for Bug#10374 broke named pipe
and shared memory transports on Windows due to a failure to
implement a dummy poll method for transports other than BSD
sockets. Another problem was that mysqltest lacked support
for named pipe and shared memory connections, which lead to
misleading test cases that were supposed run common queries
over both transports.
The solution is to properly implement, at the VIO layer, the
poll and is_connected methods. The is_connected method is
implemented for every suppported transport and the poll one
only where it makes sense. Furthermore, support for named pipe
and shared memory connections is added to mysqltest as to
enable testing of both transports using the test suite.
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 8f2739f8e77..c466dcc5cb9 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3471,7 +3471,7 @@ static int interruptible_wait(THD *thd, pthread_cond_t *cond, if (error == ETIMEDOUT || error == ETIME) { /* Return error if timed out or connection is broken. */ - if (!timeout || !thd->vio_is_connected()) + if (!timeout || !thd->is_connected()) break; } } while (error && timeout); |