diff options
Diffstat (limited to 'databases/mysql80-server/files')
4 files changed, 15 insertions, 44 deletions
diff --git a/databases/mysql80-server/files/patch-client_CMakeLists.txt b/databases/mysql80-server/files/patch-client_CMakeLists.txt index ce5a1d0901be..54ba3d72b9f5 100644 --- a/databases/mysql80-server/files/patch-client_CMakeLists.txt +++ b/databases/mysql80-server/files/patch-client_CMakeLists.txt @@ -1,16 +1,14 @@ --- client/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC +++ client/CMakeLists.txt -@@ -28,16 +28,16 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil +@@ -26,14 +26,14 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil ## Subdirectory with common client code. ADD_SUBDIRECTORY(base) -## Subdirectory for mysqlpump code. -ADD_SUBDIRECTORY(dump) - INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) - +IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc pattern_matcher.cc) + MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc pattern_matcher.cc ${CMAKE_SOURCE_DIR}/sql/net_ns.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) @@ -37,7 +35,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) SET(MYSQLBINLOG_LIB_SOURCES ${CMAKE_SOURCE_DIR}/strings/decimal.cc -@@ -110,16 +113,20 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli +@@ -107,12 +110,15 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) @@ -49,11 +47,6 @@ +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc) TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl) -+ - # Bug in /usr/lib/gcc-snapshot/lib/libstdc++.so ?? - IF(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "9.0.0") - TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup -static-libstdc++) - ENDIF() +ENDIF() # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". diff --git a/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt b/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt index cdff6bb5a339..5339bb1cd87b 100644 --- a/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt +++ b/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt @@ -1,18 +1,16 @@ --- plugin/x/CMakeLists.txt.orig 2018-04-08 06:44:49 UTC +++ plugin/x/CMakeLists.txt -@@ -89,12 +89,15 @@ INCLUDE_DIRECTORIES( +@@ -80,11 +80,14 @@ INCLUDE_DIRECTORIES( ${MYSQLX_GENERATE_DIR} ${MYSQLX_PROTOCOL_INCLUDE_DIR} ${MYSQLX_CLIENT_INCLUDE_DIR} + ${BOOST_INCLUDE_DIR} ) - INCLUDE_DIRECTORIES(SYSTEM - ${PROTOBUF_INCLUDE_DIRS} - ${LIBEVENT_INCLUDE_DIRS} - ${ICU_INCLUDE_DIRS} -+ ${SSL_INCLUDE_DIRS} -+ ${ZLIB_INCLUDE_DIR} - ) + MY_INCLUDE_SYSTEM_DIRECTORIES(PROTOBUF) + MY_INCLUDE_SYSTEM_DIRECTORIES(LIBEVENT) + MY_INCLUDE_SYSTEM_DIRECTORIES(ICU) ++MY_INCLUDE_SYSTEM_DIRECTORIES(SSL) ++MY_INCLUDE_SYSTEM_DIRECTORIES(ZLIB) SET(MYSQLX_PROTBUF_AND_PROTOCOL_LIB diff --git a/databases/mysql80-server/files/patch-router_src_harness_CMakeLists.txt b/databases/mysql80-server/files/patch-router_src_harness_CMakeLists.txt deleted file mode 100644 index 9762f0373faf..000000000000 --- a/databases/mysql80-server/files/patch-router_src_harness_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- router/src/harness/CMakeLists.txt.orig 2018-11-04 22:41:07 UTC -+++ router/src/harness/CMakeLists.txt -@@ -128,7 +128,7 @@ IF(WIN32) - COMPILE_FLAGS -DHARNESS_STATIC_DEFINE) - ENDIF() - IF(THREADS_HAVE_PTHREAD_ARG) -- target_compile_options(PUBLIC harness-archive "-pthread") -+ target_compile_options(harness-archive PUBLIC "-pthread") - ENDIF() - - # create harness library - dynamic version diff --git a/databases/mysql80-server/files/patch-sql_mysqld.cc b/databases/mysql80-server/files/patch-sql_mysqld.cc index 82f269279457..b88e85c57a12 100644 --- a/databases/mysql80-server/files/patch-sql_mysqld.cc +++ b/databases/mysql80-server/files/patch-sql_mysqld.cc @@ -11,19 +11,10 @@ #define FILE_LINE_ARGS , const char *, int @@ -4530,7 +4530,7 @@ static void init_ssl() { - static int init_ssl_communication() { + static void init_ssl() { #ifdef HAVE_OPENSSL --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) - char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; - int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string); - if (ret_fips_mode != 1) { -@@ -8919,7 +8919,7 @@ bool mysqld_get_one_option(int optid, - One can disable SSL later by using --skip-ssl or --ssl=0. - */ - opt_use_ssl = true; --#ifdef HAVE_WOLFSSL -+#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER) - /* crl has no effect in wolfSSL. */ - opt_ssl_crl = NULL; - opt_ssl_crlpath = NULL; +-#if !defined(HAVE_WOLFSSL) && !defined(__sun) ++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) && !defined(__sun) + #if defined(HAVE_PSI_MEMORY_INTERFACE) + static PSI_memory_info all_openssl_memory[] = { + {&key_memory_openssl, "openssl_malloc", 0, 0, |