diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-10 09:35:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-10 09:35:50 +0200 |
| commit | f169dfb41adcb637732507ed56d3038003170a15 (patch) | |
| tree | 233560fbdc966f7674618431a8ef75375831651a /plugin | |
| parent | 25c048066a9557d1aa506220316c6fa57be5da91 (diff) | |
| parent | 08267ba0c88d2f3ba1bacee9bb9a1e4da921a60a (diff) | |
| download | mariadb-git-f169dfb41adcb637732507ed56d3038003170a15.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/cracklib_password_check/cracklib_password_check.c | 2 | ||||
| -rw-r--r-- | plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp | 5 | ||||
| -rw-r--r-- | plugin/handler_socket/libhsclient/allocator.hpp | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/plugin/cracklib_password_check/cracklib_password_check.c b/plugin/cracklib_password_check/cracklib_password_check.c index 470e6e5280f..5a7c7f3f234 100644 --- a/plugin/cracklib_password_check/cracklib_password_check.c +++ b/plugin/cracklib_password_check/cracklib_password_check.c @@ -13,7 +13,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ -#include <my_global.h> +#include <my_alloca.h> #include <mysql/plugin_password_validation.h> #include <crack.h> #include <string.h> 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" diff --git a/plugin/handler_socket/libhsclient/allocator.hpp b/plugin/handler_socket/libhsclient/allocator.hpp index dd3a28ba7bd..9df6a1ab752 100644 --- a/plugin/handler_socket/libhsclient/allocator.hpp +++ b/plugin/handler_socket/libhsclient/allocator.hpp @@ -11,6 +11,7 @@ #include <stdlib.h> #include <string.h> +#include <my_alloca.h> #if 0 extern "C" { |