summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorBrad Smith <brad@comstyle.com>2022-10-15 20:19:41 -0400
committerDaniel Black <daniel@mariadb.org>2022-10-26 17:21:23 +1100
commit4b87d3628acf815836c0efc84fbcd878517d9b89 (patch)
tree640ceb6e7822da7645b41efc401541fbb9e7b7ff /plugin
parentd86ad1f127fdc71e888e2e168b99f561f111a0b2 (diff)
downloadmariadb-git-4b87d3628acf815836c0efc84fbcd878517d9b89.tar.gz
Further tweaking the alloca handling in Hashicorp plugin
Diffstat (limited to 'plugin')
-rw-r--r--plugin/hashicorp_key_management/hashicorp_key_management_plugin.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/plugin/hashicorp_key_management/hashicorp_key_management_plugin.cc b/plugin/hashicorp_key_management/hashicorp_key_management_plugin.cc
index 730707ff52b..7c72af688e4 100644
--- a/plugin/hashicorp_key_management/hashicorp_key_management_plugin.cc
+++ b/plugin/hashicorp_key_management/hashicorp_key_management_plugin.cc
@@ -13,12 +13,10 @@
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 <mysql/plugin_encryption.h>
#include <mysqld_error.h>
#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <time.h>
#include <errno.h>
#include <string>
#include <sstream>
@@ -26,8 +24,6 @@
#ifdef _WIN32
#include <malloc.h>
#define alloca _alloca
-#elif !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
-#include <alloca.h>
#endif
#include <algorithm>
#include <unordered_map>