diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-14 17:23:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-14 17:23:34 +0300 |
| commit | 60589aeee03949033c66da5c1eae70d4342179fc (patch) | |
| tree | 1cd399dbed17c5c7b4ed16eb7b872dc979af1c93 /sql/threadpool_unix.cc | |
| parent | b39e6e3d093b45f792959ef06fea1c175263ae1a (diff) | |
| download | mariadb-git-60589aeee03949033c66da5c1eae70d4342179fc.tar.gz | |
Next part of merge. See TODO for details
Diffstat (limited to 'sql/threadpool_unix.cc')
| -rw-r--r-- | sql/threadpool_unix.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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 |