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

10.0-base merge

Browse source
This commit is contained in:
Sergei Golubchik 2013-04-15 15:09:22 +02:00
commit a9035be5b7
976 changed files with 38085 additions and 26743 deletions
Download patch file Download diff file Expand all files Collapse all files

17
sql/threadpool_unix.cc
View file

@ -29,14 +29,14 @@
#ifdef __linux__
#include <sys/epoll.h>
typedef struct epoll_event native_event;
#endif
#if defined (__FreeBSD__) || defined (__APPLE__)
#elif defined(HAVE_KQUEUE)
#include <sys/event.h>
typedef struct kevent native_event;
#endif
#if defined (__sun)
#elif defined (__sun)
#include <port.h>
typedef port_event_t native_event;
#else
#error threadpool is not available on this platform
#endif
/** Maximum number of native events a listener can read in one go */
@ -285,7 +285,7 @@ static void *native_event_get_userdata(native_event *event)
return event->data.ptr;
}
#elif defined (__FreeBSD__) || defined (__APPLE__)
#elif defined(HAVE_KQUEUE)
int io_poll_create()
{
return kqueue();
@ -386,8 +386,6 @@ static void* native_event_get_userdata(native_event *event)
{
return event->portev_user;
}
#else
#error not ported yet to this OS
#endif
@ -1247,11 +1245,12 @@ static void connection_abort(connection_t *connection)
DBUG_ENTER("connection_abort");
thread_group_t *group= connection->thread_group;
threadpool_remove_connection(connection->thd);
mysql_mutex_lock(&group->mutex);
group->connection_count--;
mysql_mutex_unlock(&group->mutex);
threadpool_remove_connection(connection->thd);
my_free(connection);
DBUG_VOID_RETURN;
}