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

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
 {

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)