diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-17 06:59:46 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-17 06:59:46 +0200 |
| commit | 3dd33789c1b2003dab7f98d4ec390476076a2267 (patch) | |
| tree | 6910cfc98cfd47e8b2b1ecee1d981c3e44391496 /plugin | |
| parent | 5f33351f48557fa09d5ebcf9864c33bfa296cd8e (diff) | |
| parent | fffa4b28a136d1297066cc652127619d0ed82449 (diff) | |
| download | mariadb-git-3dd33789c1b2003dab7f98d4ec390476076a2267.tar.gz | |
Merge 10.9 into 10.10
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 9568f84a03b..1aaf6ba0693 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" { |