Merge 8.4.8 from upstream Oracle

Author: dbentley-vsql

CMakeLists.txt

@@ -539,6 +539,18 @@ IF(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY)
   SET(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY OFF CACHE INTERNAL "" FORCE)
 ENDIF()
 
+# We have our own WITH_UNIT_TESTS option, and call ENABLE_TESTING() accordingly.
+# We do not INCLUDE(CTest) here.
+# Various 3rd party libraries use this option, so set it to OFF.
+OPTION(BUILD_TESTING "See <cmake root>/Modules/CTest.cmake" OFF)
+IF(BUILD_TESTING)
+  MESSAGE(WARNING "Do not set BUILD_TESTING to ON/TRUE, "
+    "use the cmake option WITH_UNIT_TESTS instead."
+    )
+  SET(BUILD_TESTING OFF)
+  SET(BUILD_TESTING OFF CACHE INTERNAL "" FORCE)
+ENDIF()
+
 # Ninja only: List of available pools.
 SET_PROPERTY(GLOBAL PROPERTY JOB_POOLS one_job=1)
 
@@ -1210,22 +1222,17 @@ IF(CMAKE_C_FLAGS MATCHES "-fsanitize" OR CMAKE_CXX_FLAGS MATCHES "-fsanitize")
   SET(CMAKE_COMPILER_FLAG_WITH_SANITIZE 1)
 ENDIF()
 
-# Older versions of ccache must be disabled: export CCACHE_DISABLE=1
-# See http://www.cmake.org/Wiki/CTest/Coverage
 OPTION(ENABLE_GCOV "Enable gcov (debug, Linux builds only)" OFF)
 IF (ENABLE_GCOV AND NOT WIN32 AND NOT APPLE)
-  STRING_APPEND(CMAKE_C_FLAGS
-  " -fprofile-arcs -ftest-coverage -fprofile-update=prefer-atomic -DHAVE_GCOV")
-  STRING_APPEND(CMAKE_CXX_FLAGS
-  " -fprofile-arcs -ftest-coverage -fprofile-update=prefer-atomic -DHAVE_GCOV")
+  SET(GCOV_COMPILER_OPTIONS
+    "-fprofile-arcs -ftest-coverage -fprofile-update=prefer-atomic")
+  STRING_APPEND(CMAKE_C_FLAGS   " ${GCOV_COMPILER_OPTIONS} -DHAVE_GCOV")
+  STRING_APPEND(CMAKE_CXX_FLAGS " ${GCOV_COMPILER_OPTIONS} -DHAVE_GCOV")
   STRING_APPEND(CMAKE_C_LINK_FLAGS " -Wl,--dynamic-list-data")
   STRING_APPEND(CMAKE_CXX_LINK_FLAGS " -Wl,--dynamic-list-data")
-  STRING_APPEND(CMAKE_EXE_LINKER_FLAGS
-  " -fprofile-arcs -ftest-coverage -fprofile-update=prefer-atomic -lgcov")
-  STRING_APPEND(CMAKE_SHARED_LINKER_FLAGS
-  " -fprofile-arcs -ftest-coverage -fprofile-update=prefer-atomic -lgcov")
-  STRING_APPEND(CMAKE_MODULE_LINKER_FLAGS
-  " -fprofile-arcs -ftest-coverage -fprofile-update=prefer-atomic -lgcov")
+  STRING_APPEND(CMAKE_EXE_LINKER_FLAGS    " ${GCOV_COMPILER_OPTIONS} -lgcov")
+  STRING_APPEND(CMAKE_SHARED_LINKER_FLAGS " ${GCOV_COMPILER_OPTIONS} -lgcov")
+  STRING_APPEND(CMAKE_MODULE_LINKER_FLAGS " ${GCOV_COMPILER_OPTIONS} -lgcov")
 ENDIF()
 
 OPTION(ENABLE_GPROF "Enable gprof (optimized, Linux builds only)" OFF)
@@ -2403,12 +2410,14 @@ IF(NOT WITHOUT_SERVER AND WITH_UNIT_TESTS)
       ENDIF()
       # The mold linker and RelWithDebInfo build complains about
       # the new expression in Rpl_info_values::init()
+      # We get stringop warnings in functions generated by protobuf.
+      # We get even more stringop warnings from gcc 14.2 lto-wrapper.
       IF(MY_COMPILER_IS_GNU)
-        MY_TARGET_LINK_OPTIONS(server_unittest_library
-          "-Wno-alloc-size-larger-than")
-        # In functions generated by protobuf:
-        MY_TARGET_LINK_OPTIONS(server_unittest_library
-          "-Wno-stringop-overflow")
+        TARGET_LINK_OPTIONS(server_unittest_library PUBLIC
+          -Wno-alloc-size-larger-than
+          -Wno-stringop-overflow
+          -Wno-stringop-overread
+          )
       ENDIF()
     ENDIF()
   ELSE()
@@ -2453,6 +2462,8 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
                ${CMAKE_BINARY_DIR}/include/mysql_version.h )
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/villagesql/include/version.h.in
                ${CMAKE_BINARY_DIR}/villagesql/include/version.h )
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_server_suffix.h.in
+               ${CMAKE_BINARY_DIR}/include/mysql_server_suffix.h)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in
     ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc)
 

MYSQL_VERSION

@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=8
 MYSQL_VERSION_MINOR=4
-MYSQL_VERSION_PATCH=6
+MYSQL_VERSION_PATCH=8
 MYSQL_VERSION_MATURITY="LTS"

README

@@ -1,4 +1,4 @@
-Copyright (c) 2000, 2025, Oracle and/or its affiliates.
+Copyright (c) 2000, 2026, Oracle and/or its affiliates.
 
 This is a release of MySQL, an SQL database server.
 

client/mysqldump.cc

@@ -5712,7 +5712,8 @@ static char *primary_key_fields(const char *table_name) {
               table_name, table_name);
       continue;
     }
-    if (atoi(row[3]) < 1) break;
+    /* break if the index is not unique */
+    if (row[1] && *row[1] && atoi(row[1]) > 0) break;
     if (row[4] && *row[4]) order_by_part = quote_name(row[4], buff, false);
 #ifdef USABLE_EXPR_IN_SHOW_INDEX_BUG35273994
     else if (mysql_num_fields(res) > 14 && row[14] &&
@@ -5748,7 +5749,8 @@ static char *primary_key_fields(const char *table_name) {
     while (nullptr != (row = mysql_fetch_row(res))) {
       unsigned braces_length = 0;
       if (!row[3] || !*row[3]) continue;
-      if (atoi(row[3]) < 1) break;
+      /* break if the index is not unique */
+      if (row[1] && *row[1] && atoi(row[1]) > 0) break;
       if (row[4] && *row[4]) order_by_part = quote_name(row[4], buff, false);
 #ifdef USABLE_EXPR_IN_SHOW_INDEX_BUG35273994
       else if (mysql_num_fields(res) > 14 && row[14] && *row[14]) {

cmake/curl.cmake

@@ -255,8 +255,9 @@ FUNCTION(MYSQL_CHECK_CURL)
     SET_TARGET_PROPERTIES(curl_interface PROPERTIES INTERFACE_COMPILE_OPTIONS
       "-Wno-error=deprecated-declarations")
   ENDIF()
-  IF(WIN32_CLANG)
-    SET_TARGET_PROPERTIES(curl_interface PROPERTIES INTERFACE_COMPILE_DEFINITIONS
+  IF(MY_COMPILER_IS_CLANG)
+    SET_TARGET_PROPERTIES(curl_interface
+      PROPERTIES INTERFACE_COMPILE_DEFINITIONS
       CURL_DISABLE_DEPRECATION)
   ENDIF()
 

cmake/googletest.cmake

@@ -21,7 +21,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-SET(GOOGLETEST_RELEASE googletest-1.14.0)
+SET(GOOGLETEST_RELEASE googletest-1.17.0)
 SET(GMOCK_SOURCE_DIR
   ${CMAKE_SOURCE_DIR}/extra/googletest/${GOOGLETEST_RELEASE}/googlemock)
 SET(GTEST_SOURCE_DIR
@@ -72,6 +72,7 @@ FOREACH(googletest_library
 ENDFOREACH()
 
 # googletest/src/gtest-internal-inl.h: In member function 'OnTestEnd'
-IF(MY_COMPILER_IS_GNU AND FPROFILE_USE)
-  TARGET_LINK_OPTIONS(gtest INTERFACE -Wno-error=stringop-overflow)
+IF(MY_COMPILER_IS_GNU)
+  TARGET_LINK_OPTIONS(gmock INTERFACE -Wno-stringop-overflow)
+  TARGET_LINK_OPTIONS(gtest INTERFACE -Wno-stringop-overflow)
 ENDIF()

cmake/install_macros.cmake

@@ -334,16 +334,32 @@ ENDFUNCTION()
 
 # On Unix: add to RPATH of an executable when it is installed.
 # Use 'chrpath' or 'patchelf --print-rpath' to inspect results.
-# For Solaris, use 'elfdump -d'
-MACRO(ADD_INSTALL_RPATH TARGET VALUE)
-  GET_TARGET_PROPERTY(CURRENT_RPATH_${TARGET} ${TARGET} INSTALL_RPATH)
-  IF(NOT CURRENT_RPATH_${TARGET})
-    SET(CURRENT_RPATH_${TARGET})
+# For Solaris, use 'elfdump -d'.
+FUNCTION(ADD_INSTALL_RPATH_VALUE TARGET VALUE)
+  GET_TARGET_PROPERTY(CURRENT_RPATH ${TARGET} INSTALL_RPATH)
+  IF(NOT CURRENT_RPATH)
+    SET(CURRENT_RPATH)
   ENDIF()
-  LIST(APPEND CURRENT_RPATH_${TARGET} ${VALUE})
+
+  # Strip off trailing "/"
+  STRING(REGEX REPLACE "(.*)\/$" "\\1" VALUE "${VALUE}")
+  LIST(APPEND CURRENT_RPATH ${VALUE})
+
+  # Sort list such that items containing $ORIGIN/... comes first
+  IF(LINUX)
+    LIST(REMOVE_DUPLICATES CURRENT_RPATH)
+    LIST(SORT CURRENT_RPATH)
+  ENDIF()
+
   SET_TARGET_PROPERTIES(${TARGET}
-    PROPERTIES INSTALL_RPATH "${CURRENT_RPATH_${TARGET}}")
-ENDMACRO()
+    PROPERTIES INSTALL_RPATH "${CURRENT_RPATH}")
+ENDFUNCTION(ADD_INSTALL_RPATH_VALUE)
+
+FUNCTION(ADD_INSTALL_RPATH TARGET VALUE_LIST)
+  FOREACH(_value ${VALUE_LIST})
+    ADD_INSTALL_RPATH_VALUE(${TARGET} ${_value})
+  ENDFOREACH()
+ENDFUNCTION()
 
 
 # For standalone Linux build or community RPM build, we support

cmake/mysql_add_executable.cmake

@@ -81,11 +81,13 @@ FUNCTION(MYSQL_ADD_EXECUTABLE target_arg)
                        # command, which is probably not what you want
                        # (except for mysqld.lib which is used by plugins).
     EXCLUDE_FROM_ALL   # add target, but do not build it by default
-    EXCLUDE_FROM_PGO   # add target, but do not build for FPROFILE_GENERATE
+    EXCLUDE_FROM_GCOV  # Skip target for ENABLE_GCOV
+    EXCLUDE_FROM_PGO   # Skip target for FPROFILE_GENERATE
     SKIP_INSTALL       # do not install it
     SKIP_TCMALLOC      # do not link with tcmalloc
     )
   SET(EXECUTABLE_ONE_VALUE_KW
+    ADD_GCOV_TEST      # add unit test if ENABLE_GCOV, sets SKIP_INSTALL
     ADD_TEST           # add unit test, sets SKIP_INSTALL
     COMPONENT
     DESTINATION        # install destination, defaults to ${INSTALL_BINDIR}
@@ -113,6 +115,10 @@ FUNCTION(MYSQL_ADD_EXECUTABLE target_arg)
     ENDIF()
   ENDIF()
 
+  IF(ENABLE_GCOV AND ARG_EXCLUDE_FROM_GCOV)
+    RETURN()
+  ENDIF()
+
   SET(target ${target_arg})
   SET(sources ${ARG_UNPARSED_ARGUMENTS})
 
@@ -144,6 +150,12 @@ FUNCTION(MYSQL_ADD_EXECUTABLE target_arg)
 
   SET_PATH_TO_CUSTOM_SSL_FOR_APPLE(${target})
 
+  # Create it anyways if we are running GCOV.
+  IF(ENABLE_GCOV AND ARG_ADD_GCOV_TEST)
+    SET(ARG_ADD_TEST ${ARG_ADD_GCOV_TEST})
+    UNSET(ARG_EXCLUDE_FROM_ALL)
+  ENDIF()
+
   IF(ARG_DEPENDENCIES)
     ADD_DEPENDENCIES(${target} ${ARG_DEPENDENCIES})
   ENDIF()

cmake/protobuf.cmake

@@ -164,7 +164,9 @@ MACRO(MYSQL_CHECK_PROTOBUF)
     #             )
     # INTERFACE_LINK_LIBRARIES will be needed once this is built
     # with protobuf 22 and above (lots of abseil libs).
-    ADD_LIBRARY(ext::libprotobuf UNKNOWN IMPORTED)
+    IF(NOT TARGET ext::libprotobuf)
+      ADD_LIBRARY(ext::libprotobuf UNKNOWN IMPORTED)
+    ENDIF()
     SET_TARGET_PROPERTIES(ext::libprotobuf PROPERTIES
       INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}")
     SET_TARGET_PROPERTIES(ext::libprotobuf PROPERTIES
@@ -175,7 +177,9 @@ MACRO(MYSQL_CHECK_PROTOBUF)
         INTERFACE_LINK_LIBRARIES "${protobuf_dependencies}")
     ENDIF()
 
-    ADD_LIBRARY(ext::libprotobuf-lite UNKNOWN IMPORTED)
+    IF(NOT TARGET ext::libprotobuf-lite)
+      ADD_LIBRARY(ext::libprotobuf-lite UNKNOWN IMPORTED)
+    ENDIF()
     SET_TARGET_PROPERTIES(ext::libprotobuf-lite PROPERTIES
       INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}")
     SET_TARGET_PROPERTIES(ext::libprotobuf-lite PROPERTIES
@@ -186,7 +190,9 @@ MACRO(MYSQL_CHECK_PROTOBUF)
         INTERFACE_LINK_LIBRARIES "${lite_dependencies}")
     ENDIF()
 
-    ADD_LIBRARY(ext::libprotoc UNKNOWN IMPORTED)
+    IF(NOT TARGET ext::libprotoc)
+      ADD_LIBRARY(ext::libprotoc UNKNOWN IMPORTED)
+    ENDIF()
     SET_TARGET_PROPERTIES(ext::libprotoc PROPERTIES
       INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}")
     SET_TARGET_PROPERTIES(ext::libprotoc PROPERTIES

cmake/protobuf_proto_compile.cmake

@@ -342,9 +342,9 @@ FUNCTION(MYSQL_PROTOBUF_GENERATE_PY GENERATED_SOURCE)
     GET_FILENAME_COMPONENT(WITHOUT_DIR_AND_EXT ${PROTO_FILE} NAME_WE)
 
     SET(GENERATED_GRPC_FILE
-      "${GENERATE_OUTPUT_DIRECTORY}/${WITHOUT_DIR_AND_EXT}_grpc.py")
+      "${GENERATE_OUTPUT_DIRECTORY}/${WITHOUT_DIR_AND_EXT}_pb2_grpc.py")
     SET(GENERATED_PY_FILE
-      "${GENERATE_OUTPUT_DIRECTORY}/${WITHOUT_DIR_AND_EXT}.py")
+      "${GENERATE_OUTPUT_DIRECTORY}/${WITHOUT_DIR_AND_EXT}_pb2.py")
 
     ADD_CUSTOM_COMMAND(
       OUTPUT "${GENERATED_GRPC_FILE}"