PS-9734 merge: Code refresh for 8.0.42-33 (merge with conflicts)

https://perconadev.atlassian.net/browse/PS-9734

Author: percona-ysorokin

.clang-format

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,

.clang-tidy

@@ -1,4 +1,4 @@
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,

.gitconfig

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -252,8 +252,11 @@ ENDIF()
 IF(MY_HOST_SYSTEM_NAME MATCHES "Linux")
   # Trust 'rpm -qf /' rather than 'uname -s'
   STRING(REGEX MATCH "\\.el([6789])\\." MATCH_FSYS "${MY_HOST_FILESYSTEM_NAME}")
+  IF(NOT CMAKE_MATCH_1)
+    STRING(REGEX MATCH "\\.el(10)\\." MATCH_FSYS "${MY_HOST_FILESYSTEM_NAME}")
+  ENDIF()
 
-  # Set LINUX_RHEL6, LINUX_RHEL7, LINUX_RHEL8 or LINUX_RHEL9
+  # Set LINUX_RHEL6, LINUX_RHEL7, LINUX_RHEL8 or LINUX_RHEL9 or LINUX_RHEL10
   IF(CMAKE_MATCH_1)
     SET(LINUX_RHEL 1)
     SET(LINUX_RHEL${CMAKE_MATCH_1} 1)
@@ -326,7 +329,7 @@ IF(CMAKE_HOST_UNIX AND NOT FORCE_UNSUPPORTED_COMPILER
     IF(LINUX_RHEL)
       MESSAGE(STATUS "This is ${MATCH_FSYS} as found from 'rpm -qf /'")
     ENDIF()
-    IF(LINUX_RHEL)
+    IF(LINUX_RHEL AND NOT LINUX_RHEL10)
       MESSAGE(STATUS "Looking for a devtoolset compiler")
       IF(LINUX_RHEL6)
         SET(ALTERNATIVE_PATHS "/opt/rh/devtoolset-8")
@@ -339,6 +342,8 @@ IF(CMAKE_HOST_UNIX AND NOT FORCE_UNSUPPORTED_COMPILER
         ENDIF()
       ELSEIF(LINUX_RHEL8 OR LINUX_RHEL9)
         SET(ALTERNATIVE_PATHS "/opt/rh/gcc-toolset-12")
+      ELSEIF(LINUX_RHEL10)
+        # Use default /usr/bin/gcc which is 14.2.1
       ENDIF()
 
       FOREACH(OPT_PATH ${ALTERNATIVE_PATHS})
@@ -2275,6 +2280,7 @@ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(strings)
 ADD_SUBDIRECTORY(extra/unordered_dense)
+ADD_SUBDIRECTORY(extra/xxhash)
 ADD_SUBDIRECTORY(vio)
 ADD_SUBDIRECTORY(mysys)
 ADD_SUBDIRECTORY(libmysql)

Docs/sp-imp-spec.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2003, 2024, Oracle and/or its affiliates.
+Copyright (c) 2003, 2025, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License, version 2.0,

Doxyfile-ignored

@@ -1,4 +1,4 @@
-# Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,

Doxyfile.in

@@ -1,4 +1,4 @@
-## Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+## Copyright (c) 2015, 2025, Oracle and/or its affiliates.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License, version 2.0,

LICENSE

@@ -1,25 +1,25 @@
 Licensing Information User Manual
 
-MySQL 8.0.41 Community
+MySQL 8.0.42 Community
      __________________________________________________________________
 
 Introduction
 
    This License Information User Manual contains Oracle's product license
    and other licensing information, including licensing information for
    third-party software which may be included in this distribution of
-   MySQL 8.0.41 Community.
+   MySQL 8.0.42 Community.
 
-   Last updated: November 2024
+   Last updated: March 2025
 
 Licensing Information
 
-   This release of MySQL 8.0.41 Community is brought to you by the MySQL
+   This release of MySQL 8.0.42 Community is brought to you by the MySQL
    team at Oracle. This software is released under version 2 of the GNU
    General Public License (GPLv2), as set forth below, with the following
    additional permissions:
 
-   This distribution of MySQL 8.0.41 Community is designed to work with
+   This distribution of MySQL 8.0.42 Community is designed to work with
    certain software (including but not limited to OpenSSL) that is
    licensed under separate terms, as designated in a particular file or
    component or in the license documentation. Without limiting your rights
@@ -36,7 +36,7 @@ Licensing Information
    reproduced below and can also be found along with its FAQ at
    http://oss.oracle.com/licenses/universal-foss-exception.
 
-   Copyright (c) 1997, 2024, Oracle and/or its affiliates.
+   Copyright (c) 1997, 2025, Oracle and/or its affiliates.
 
 Election of GPLv2
 
@@ -3974,6 +3974,35 @@ SOFTWARE.
    ======================================================================
    ======================================================================
 
+xxHash
+
+Copyright (c) 2012-2021 Yann Collet
+All rights reserved.
+BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, 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 HOLDERS AND CONTRIBUTORS "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 OR CONTRIBUTORS 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.
+Some source files include the above license with different copyright years:
+Copyright (C) 2012-2023 Yann Collet
+Copyright (C) 2020-2024 Yann Collet
+
+   ======================================================================
+   ======================================================================
+
 zlib
 
 Oracle gratefully acknowledges the contributions of Jean-loup Gailly

MYSQL_VERSION

@@ -1,5 +1,13 @@
 MYSQL_VERSION_MAJOR=8
 MYSQL_VERSION_MINOR=0
+<<<<<<< HEAD
 MYSQL_VERSION_PATCH=41
 MYSQL_VERSION_EXTRA=-32
+||||||| 14ba93991ba
+MYSQL_VERSION_PATCH=41
+MYSQL_VERSION_EXTRA=
+=======
+MYSQL_VERSION_PATCH=42
+MYSQL_VERSION_EXTRA=
+>>>>>>> mysql-8.0.42
 MYSQL_VERSION_STABILITY="LTS"

client/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,