mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-09 16:44:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Next part of merge. See TODO for details

Browse source
This commit is contained in:
Michael Widenius 2012-08-14 17:23:34 +03:00
commit 60589aeee0
701 changed files with 138234 additions and 2250 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/threadpool_unix.cc
View file

@ -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