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

after-merge: 10.0 part of MDEV-9249 (ERR_remove_state)

Browse Source
This commit is contained in:
Sergei Golubchik
2015-12-21 16:37:59 +01:00
parent 05dc86c09f
commit 4fdf25afa8
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysys_ssl/my_aes.cc
View File

@@ -26,6 +26,10 @@
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
#ifdef HAVE_ERR_remove_thread_state
#define ERR_remove_state(X) ERR_remove_thread_state(NULL)
#endif
// Wrap C struct, to ensure resources are released. // Wrap C struct, to ensure resources are released.
struct MyCipherCtx struct MyCipherCtx
{ {

2
storage/perfschema/CMakeLists.txt
View File

@@ -17,7 +17,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/sql ${CMAKE_SOURCE_DIR}/sql
${PCRE_INCLUDES} ${PCRE_INCLUDES}
${CMAKE_SOURCE_DIR}/extra/yassl/include) ${SSL_INCLUDE_DIRS})
ADD_DEFINITIONS(-DMYSQL_SERVER) ADD_DEFINITIONS(-DMYSQL_SERVER)