diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-17 07:00:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-17 07:00:03 +0200 |
| commit | c50f849d6459c944490fd0e633e7ef455e308051 (patch) | |
| tree | bc09746a5d8aea027447235c0179aaa51a209d88 /plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp | |
| parent | ceb0e7f944b5c252d999ac06012ac0e05925c0b2 (diff) | |
| parent | 3dd33789c1b2003dab7f98d4ec390476076a2267 (diff) | |
| download | mariadb-git-c50f849d6459c944490fd0e633e7ef455e308051.tar.gz | |
Merge 10.10 into 10.11
Diffstat (limited to 'plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp')
| -rw-r--r-- | plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp b/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp index 9863602af7a..f6bbe9004c2 100644 --- a/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp +++ b/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp @@ -6,7 +6,7 @@ * See COPYRIGHT.txt for details. */ -#include <my_global.h> +#include <my_alloca.h> #include <netinet/in.h> #include <errno.h> #include <poll.h> @@ -17,9 +17,6 @@ #if __linux__ #include <sys/epoll.h> #endif -#ifdef HAVE_ALLOCA_H -#include <alloca.h> -#endif #include "hstcpsvr_worker.hpp" #include "string_buffer.hpp" |