database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.6 into 10.8

Browse Source
This commit is contained in:
Marko Mäkelä
2023-03-16 18:11:37 +02:00
parent e97560eac0 a55b951e60
commit acf46b7b36
51 changed files with 1503 additions and 1361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/mysql/service_encryption.h
View File

@@ -24,22 +24,19 @@
*provider* (encryption plugin).
*/
#ifdef __cplusplus
extern "C" {
#endif
#ifndef MYSQL_ABI_CHECK
#include <my_alloca.h>
#ifdef _WIN32
#include <malloc.h>
#ifndef __cplusplus
#define inline __inline
#endif
#else
#include <stdlib.h>
#ifdef HAVE_ALLOCA_H
#include <alloca.h>
#endif
#endif
#ifdef __cplusplus
extern "C" {
#endif
/* returned from encryption_key_get_latest_version() */