From 60589aeee03949033c66da5c1eae70d4342179fc Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Tue, 14 Aug 2012 17:23:34 +0300 Subject: Next part of merge. See TODO for details --- sql/threadpool_unix.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/threadpool_unix.cc') diff --git a/sql/threadpool_unix.cc b/sql/threadpool_unix.cc index f5ea771883d..60c3ad69c65 100644 --- a/sql/threadpool_unix.cc +++ b/sql/threadpool_unix.cc @@ -1361,7 +1361,7 @@ static int change_group(connection_t *c, thread_group_t *new_group) { int ret= 0; - int fd = c->thd->net.vio->sd; + int fd= mysql_socket_getfd(c->thd->net.vio->mysql_socket); DBUG_ASSERT(c->thread_group == old_group); @@ -1389,7 +1389,7 @@ static int change_group(connection_t *c, static int start_io(connection_t *connection) { - int fd = connection->thd->net.vio->sd; + int fd = mysql_socket_getfd(connection->thd->net.vio->mysql_socket); /* Usually, connection will stay in the same group for the entire -- cgit v1.2.1