diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 16:37:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 16:37:59 +0100 |
| commit | 4fdf25afa8188905653a83e08fc387243e584600 (patch) | |
| tree | e477ed3a23267b3cf80266d281225273db8091ca | |
| parent | 05dc86c09fb2e001ac80654a97c0870eee6aea82 (diff) | |
| download | mariadb-git-4fdf25afa8188905653a83e08fc387243e584600.tar.gz | |
after-merge: 10.0 part of MDEV-9249 (ERR_remove_state)
| -rw-r--r-- | mysys_ssl/my_aes.cc | 4 | ||||
| -rw-r--r-- | storage/perfschema/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mysys_ssl/my_aes.cc b/mysys_ssl/my_aes.cc index 05dbfdb4f0b..2bc54d68848 100644 --- a/mysys_ssl/my_aes.cc +++ b/mysys_ssl/my_aes.cc @@ -26,6 +26,10 @@ #include <openssl/evp.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. struct MyCipherCtx { diff --git a/storage/perfschema/CMakeLists.txt b/storage/perfschema/CMakeLists.txt index 3b3ffae6357..fe3b5ec985a 100644 --- a/storage/perfschema/CMakeLists.txt +++ b/storage/perfschema/CMakeLists.txt @@ -17,7 +17,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql ${PCRE_INCLUDES} - ${CMAKE_SOURCE_DIR}/extra/yassl/include) + ${SSL_INCLUDE_DIRS}) ADD_DEFINITIONS(-DMYSQL_SERVER) |