Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

(Merge tag 'clone-5.7.35-build' into mysql-5.7-cluster-7.5)

Change-Id: I6ec640ee39231b445eb0c389b9f1cda5b8443dc6

Author: arnabray21

CMakeLists.txt

@@ -168,6 +168,18 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio" OR CMAKE_GENERATOR STREQUAL "Xcode")
   SET(BUILD_IS_SINGLE_CONFIG FALSE)
 ENDIF()
 
+IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  SET(MY_COMPILER_IS_CLANG 1)
+ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+  SET(MY_COMPILER_IS_GNU 1)
+ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
+  SET(MY_COMPILER_IS_SUNPRO 1)
+ENDIF()
+
+IF(MY_COMPILER_IS_CLANG OR MY_COMPILER_IS_GNU)
+  SET(MY_COMPILER_IS_GNU_OR_CLANG 1)
+ENDIF()
+
 # Maintainer mode is default on only for debug builds using GCC/G++
 IF(CMAKE_BUILD_TYPE MATCHES "Debug" OR WITH_DEBUG)
   IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_COMPILER_IS_GNUCXX)
@@ -332,6 +344,8 @@ MACRO(MY_SANITIZER_CHECK SAN_OPT RESULT)
   MY_CHECK_C_COMPILER_FLAG("${SAN_OPT}" C_RESULT)
   MY_CHECK_CXX_COMPILER_FLAG("${SAN_OPT}" CXX_RESULT)
   IF(C_RESULT AND CXX_RESULT)
+    STRING_APPEND(CMAKE_C_FLAGS   " ${SAN_OPT}")
+    STRING_APPEND(CMAKE_CXX_FLAGS " ${SAN_OPT}")
     # We switch on basic optimization also for debug builds.
     # We disable inlining for stack trace readability.
     # With optimization we may get some warnings, so we switch off -Werror
@@ -348,10 +362,10 @@ MACRO(MY_SANITIZER_CHECK SAN_OPT RESULT)
 ENDMACRO()
 
 OPTION(WITH_ASAN "Enable address sanitizer" OFF)
-OPTION(WITH_ASAN_SCOPE "Enable -fsanitize-address-use-after-scope" OFF)
 IF(WITH_ASAN)
   MY_SANITIZER_CHECK("-fsanitize=address" WITH_ASAN_OK)
   IF(WITH_ASAN_OK)
+    OPTION(WITH_ASAN_SCOPE "Enable -fsanitize-address-use-after-scope" ON)
     SET(HAVE_ASAN 1)
     # This works with clang, but not gcc it seems.
     MY_CHECK_CXX_COMPILER_FLAG(

LICENSE

@@ -10,7 +10,7 @@ Introduction
    third-party software which may be included in this distribution of
    MySQL NDB Cluster 7.6.12 (and later).
 
-   Last updated: March 2021
+   Last updated: April 2021
 
 Licensing Information
 
@@ -1672,6 +1672,38 @@ THE SOFTWARE.
    ======================================================================
    ======================================================================
 
+jemalloc
+
+   jemalloc
+Copyright (C) 2002-present Jason Evans <jasone@canonware.com>.
+All rights reserved.
+Copyright (C) 2007-2012 Mozilla Foundation.  All rights reserved.
+Copyright (C) 2009-present Facebook, Inc.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice(s),
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice(s),
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+   ======================================================================
+   ======================================================================
+
 lib_sql.cc
 
    lib_sql.cc

VERSION

@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=7
-MYSQL_VERSION_PATCH=34
+MYSQL_VERSION_PATCH=35
 MYSQL_VERSION_EXTRA=-ndb-7.6.19

client/CMakeLists.txt

@@ -24,7 +24,6 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/client
   ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_SOURCE_DIR}/mysys_ssl
-  ${LZ4_INCLUDE_DIR}
   ${SSL_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/libmysql
   ${CMAKE_SOURCE_DIR}/libbinlogevents/include

client/dump/CMakeLists.txt

@@ -140,11 +140,6 @@ ADD_CONVENIENCE_LIBRARY(mysqlpump_lib ${MYSQLPUMP_LIB_SOURCES})
 TARGET_LINK_LIBRARIES(mysqlpump_lib
    client_base ${LZ4_LIBRARY})
 
-ADD_COMPILE_FLAGS(
-  compression_writer.cc
-  mysqldump_tool_chain_maker.cc
-  COMPILE_FLAGS -I${LZ4_INCLUDE_DIR}
-)
 MYSQL_ADD_EXECUTABLE(mysqlpump  program.cc)
 
 TARGET_LINK_LIBRARIES(mysqlpump mysqlpump_lib ${LOCAL_BOOST_LIB})

cmake/build_configurations/compiler_options.cmake

@@ -174,6 +174,21 @@ IF(UNIX)
   STRING_PREPEND(CMAKE_CXX_FLAGS_RELEASE        "${SECTIONS_FLAG} ")
   STRING_PREPEND(CMAKE_CXX_FLAGS_MINSIZEREL     "${SECTIONS_FLAG} ")
 
+  # We need -O3 by default for RelWithDebInfo in order to avoid
+  # performance regressions from earlier releases.
+  # To disable this (and everything else in this file),
+  # do 'cmake -DWITH_DEFAULT_COMPILER_OPTIONS=NO'.
+  IF(LINUX)
+    FOREACH(flag
+        CMAKE_C_FLAGS_RELEASE
+        CMAKE_C_FLAGS_RELWITHDEBINFO
+        CMAKE_CXX_FLAGS_RELEASE
+        CMAKE_CXX_FLAGS_RELWITHDEBINFO
+        )
+      STRING(REPLACE "-O2"  "-O3" "${flag}" "${${flag}}")
+    ENDFOREACH()
+  ENDIF()
+
 ENDIF()
 
 SET(CMAKE_C_FLAGS_DEBUG

cmake/lz4.cmake

@@ -24,29 +24,38 @@
 # bundled is the default
 
 MACRO (FIND_SYSTEM_LZ4)
-  FIND_PATH(PATH_TO_LZ4 NAMES lz4frame.h)
-  FIND_LIBRARY(LZ4_SYSTEM_LIBRARY NAMES lz4)
-  IF (PATH_TO_LZ4 AND LZ4_SYSTEM_LIBRARY)
+  FIND_PATH(LZ4_INCLUDE_DIR
+    NAMES lz4frame.h)
+  FIND_LIBRARY(LZ4_SYSTEM_LIBRARY
+    NAMES lz4)
+  IF (LZ4_INCLUDE_DIR AND LZ4_SYSTEM_LIBRARY)
     SET(SYSTEM_LZ4_FOUND 1)
-    SET(LZ4_INCLUDE_DIR ${PATH_TO_LZ4})
     SET(LZ4_LIBRARY ${LZ4_SYSTEM_LIBRARY})
-    MESSAGE(STATUS "LZ4_INCLUDE_DIR ${LZ4_INCLUDE_DIR}")
-    MESSAGE(STATUS "LZ4_LIBRARY ${LZ4_LIBRARY}")
   ENDIF()
 ENDMACRO()
 
+SET(LZ4_VERSION "lz4-1.9.3")
+SET(BUNDLED_LZ4_PATH "${CMAKE_SOURCE_DIR}/extra/lz4/${LZ4_VERSION}")
+
 MACRO (MYSQL_USE_BUNDLED_LZ4)
+  SET(WITH_LZ4 "bundled" CACHE STRING "Bundled lz4 library")
   SET(BUILD_BUNDLED_LZ4 1)
-  SET(LZ4_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extra/lz4)
+  INCLUDE_DIRECTORIES(BEFORE SYSTEM ${BUNDLED_LZ4_PATH})
   SET(LZ4_LIBRARY lz4_lib)
+  ADD_CONVENIENCE_LIBRARY(lz4_lib
+    ${BUNDLED_LZ4_PATH}/lz4.c
+    ${BUNDLED_LZ4_PATH}/lz4frame.c
+    ${BUNDLED_LZ4_PATH}/lz4hc.c
+    ${BUNDLED_LZ4_PATH}/xxhash.c
+    )
 ENDMACRO()
 
-IF (NOT WITH_LZ4)
-  SET(WITH_LZ4 "bundled" CACHE STRING "By default use bundled lz4 library")
-ENDIF()
-
 MACRO (MYSQL_CHECK_LZ4)
-  IF (WITH_LZ4 STREQUAL "bundled")
+  IF(NOT WITH_LZ4)
+    SET(WITH_LZ4 "bundled" CACHE STRING "By default use bundled lz4 library")
+  ENDIF()
+
+  IF(WITH_LZ4 STREQUAL "bundled")
     MYSQL_USE_BUNDLED_LZ4()
   ELSEIF(WITH_LZ4 STREQUAL "system")
     FIND_SYSTEM_LZ4()

configure.cmake

@@ -150,6 +150,15 @@ IF(UNIX)
   ENDIF()
   MY_SEARCH_LIBS(gethostbyname_r  "nsl_r;nsl" LIBNSL)
   MY_SEARCH_LIBS(bind "bind;socket" LIBBIND)
+  # Feature test broken with -fsanitize=address, look for lib first.
+  IF(CMAKE_C_FLAGS MATCHES "-fsanitize=")
+    CHECK_LIBRARY_EXISTS(crypt crypt "" HAVE_crypt_IN_crypt)
+    # If found, do not look in libc.
+    IF(HAVE_crypt_IN_crypt)
+      SET(LIBCRYPT crypt)
+      SET(${LIBCRYPT} 1)
+    ENDIF()
+  ENDIF()
   MY_SEARCH_LIBS(crypt crypt LIBCRYPT)
   MY_SEARCH_LIBS(setsockopt socket LIBSOCKET)
   MY_SEARCH_LIBS(dlopen dl LIBDL)

extra/CMakeLists.txt

@@ -22,7 +22,6 @@
 
 INCLUDE_DIRECTORIES(
 ${CMAKE_SOURCE_DIR}/include 
-${LZ4_INCLUDE_DIR}
 # Following is for perror, in case NDB is compiled in.
 ${CMAKE_SOURCE_DIR}/storage/ndb/include
 ${CMAKE_BINARY_DIR}/storage/ndb/include
@@ -40,15 +39,6 @@ IF(NOT CMAKE_CROSSCOMPILING)
  SET_TARGET_PROPERTIES(comp_err PROPERTIES LINKER_LANGUAGE CXX)
 ENDIF()
 
-IF (BUILD_BUNDLED_LZ4)
-  ADD_CONVENIENCE_LIBRARY(lz4_lib
-    lz4/lz4.c
-    lz4/lz4frame.c
-    lz4/lz4hc.c
-    lz4/xxhash.c
-  )
-ENDIF()
-
 ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h 
                    ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
                    COMMAND comp_err
@@ -102,9 +92,8 @@ TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY})
 
 IF(WITH_INNOBASE_STORAGE_ENGINE)
 
-  IF(LZ4_INCLUDE_DIR AND LZ4_LIBRARY)
+  IF(LZ4_LIBRARY)
     ADD_DEFINITIONS(-DHAVE_LZ4=1)
-    INCLUDE_DIRECTORIES(${LZ4_INCLUDE_DIR})
   ENDIF()
 
   # Add path to the InnoDB headers

extra/lz4/LICENSE renamed to extra/lz4/lz4-1.9.3/LICENSE

@@ -1,5 +1,5 @@
 LZ4 Library
-Copyright (c) 2011-2014, Yann Collet
+Copyright (c) 2011-2016, Yann Collet
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,