Skip to content

Commit

Permalink
Implemented PS-9217 (Merge MySQL 8.0.37) - merge with conflicts
Browse files Browse the repository at this point in the history
https://perconadev.atlassian.net/browse/PS-9217

Merge tag 'mysql-8.0.37' into release-8.0.37-29
  • Loading branch information
VarunNagaraju committed Jun 12, 2024
2 parents 6199bdd + 6dcee9f commit c3e0790
Show file tree
Hide file tree
Showing 13,922 changed files with 1,053,950 additions and 367,974 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
7 changes: 4 additions & 3 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
# Copyright (c) 2016, 2024, 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,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# This program 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 included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
# separately licensed software that they have either included with
# the program or referenced in the documentation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
Expand Down
7 changes: 4 additions & 3 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
# Copyright (c) 2022, 2024, 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,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# This program 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 included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
# separately licensed software that they have either included with
# the program or referenced in the documentation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
Expand Down
7 changes: 4 additions & 3 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
# Copyright (c) 2018, 2024, 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,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# This program 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 included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
# separately licensed software that they have either included with
# the program or referenced in the documentation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
Expand Down
31 changes: 24 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
# Copyright (c) 2006, 2024, 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,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# This program 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 included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
# separately licensed software that they have either included with
# the program or referenced in the documentation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
Expand Down Expand Up @@ -90,15 +91,15 @@ ELSEIF(UNIX)
# On SunOS /opt/csw/bin/cmake is (most likely) too old.
FIND_PROGRAM(MY_UNAME uname /bin /usr/bin /usr/local/bin /sbin)
IF(MY_UNAME)
EXEC_PROGRAM(uname ARGS -s OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME)
EXECUTE_PROCESS(COMMAND uname -s OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME)
IF(MY_HOST_SYSTEM_NAME MATCHES "SunOS")
FIND_PROGRAM(MY_CMAKE cmake /usr/bin
NO_CMAKE_ENVIRONMENT_PATH
NO_SYSTEM_ENVIRONMENT_PATH
)
IF(MY_CMAKE)
MESSAGE(STATUS "Found ${MY_CMAKE}")
EXEC_PROGRAM(${MY_CMAKE} ARGS --version)
EXECUTE_PROCESS(COMMAND ${MY_CMAKE} --version)
ELSE()
MESSAGE(STATUS "Please install /usr/bin/cmake ")
ENDIF()
Expand All @@ -109,7 +110,12 @@ ELSEIF(UNIX)
ENDIF()

# CMake 3.5 is needed for TARGET_SOURCES(... $<TARGET_OBJECTS:${LIB}_objlib>)
CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1)
# CMake 3.7 is needed for VERSION_GREATER_EQUAL
# CMake 3.8 is needed for cxx_std_17
# CMake 3.10 is needed for the bundled abseil sources,
# but 3.8.2 seems to work OK
# For the set of currently supported platforms, we can bump up to:
CMAKE_MINIMUM_REQUIRED(VERSION 3.11.2)

# Will set GIT_EXECUTABLE and GIT_FOUND
FIND_PACKAGE(Git)
Expand Down Expand Up @@ -213,7 +219,8 @@ IF(UNIX)
OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE MY_UNAME_MACHINE_RESULT
)
EXEC_PROGRAM(${MY_UNAME} ARGS -r OUTPUT_VARIABLE MY_HOST_SYSTEM_VERSION)
EXECUTE_PROCESS(COMMAND ${MY_UNAME} -r
OUTPUT_VARIABLE MY_HOST_SYSTEM_VERSION)
ENDIF()
FIND_PROGRAM(MY_DPKG_BUILDFLAGS dpkg-buildflags /bin /usr/bin)
FIND_PROGRAM(MY_RPM rpm /bin /usr/bin)
Expand Down Expand Up @@ -352,9 +359,15 @@ IF(CMAKE_HOST_UNIX AND NOT FORCE_UNSUPPORTED_COMPILER
FIND_PROGRAM(ALTERNATIVE_LD ld
NO_DEFAULT_PATH
PATHS "${OPT_PATH}/root/usr/bin")
FIND_PROGRAM(ALTERNATIVE_AR gcc-ar
NO_DEFAULT_PATH
PATHS "${OPT_PATH}/root/usr/bin")
FIND_PROGRAM(ALTERNATIVE_AR ar
NO_DEFAULT_PATH
PATHS "${OPT_PATH}/root/usr/bin")
FIND_PROGRAM(ALTERNATIVE_RANLIB gcc-ranlib
NO_DEFAULT_PATH
PATHS "${OPT_PATH}/root/usr/bin")
FIND_PROGRAM(ALTERNATIVE_RANLIB ranlib
NO_DEFAULT_PATH
PATHS "${OPT_PATH}/root/usr/bin")
Expand Down Expand Up @@ -2076,6 +2089,7 @@ IF(WITH_PROTOBUF STREQUAL "bundled" OR WITH_FIDO STREQUAL "bundled")
# INSTALL_RPATH must be set for all binaries linking with libprotobuf.
IF(WITH_PROTOBUF STREQUAL "bundled")
SET(UNIX_INSTALL_RPATH_ORIGIN_PRIV_LIBDIR 1)
ADD_SUBDIRECTORY(extra/abseil)
ADD_SUBDIRECTORY(extra/protobuf)
ENDIF()

Expand Down Expand Up @@ -2321,6 +2335,9 @@ IF(NOT WITHOUT_SERVER AND WITH_UNIT_TESTS)
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")
ENDIF()
ENDIF()
ELSE()
Expand Down
7 changes: 4 additions & 3 deletions Docs/README.build
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
Copyright (c) 2003, 2023, Oracle and/or its affiliates.
Copyright (c) 2003, 2024, 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,
as published by the Free Software Foundation.

This program is also distributed with certain software (including
This program 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 included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
separately licensed software that they have either included with
the program or referenced in the documentation.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Expand Down
7 changes: 4 additions & 3 deletions Docs/sp-imp-spec.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
Copyright (c) 2003, 2023, Oracle and/or its affiliates.
Copyright (c) 2003, 2024, 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,
as published by the Free Software Foundation.

This program is also distributed with certain software (including
This program 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 included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
separately licensed software that they have either included with
the program or referenced in the documentation.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Expand Down
7 changes: 4 additions & 3 deletions Doxyfile-ignored
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
# Copyright (c) 2015, 2024, 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,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# This program 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 included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
# separately licensed software that they have either included with
# the program or referenced in the documentation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
Expand Down
7 changes: 4 additions & 3 deletions Doxyfile.in
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
## Copyright (c) 2015, 2023, Oracle and/or its affiliates.
## Copyright (c) 2015, 2024, 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,
## as published by the Free Software Foundation.
##
## This program is also distributed with certain software (including
## This program 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 included license
## documentation. The authors of MySQL hereby grant you an additional
## permission to link the program and your derivative works with the
## separately licensed software that they have included with MySQL.
## separately licensed software that they have either included with
## the program or referenced in the documentation.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
Expand Down
Loading

0 comments on commit c3e0790

Please sign in to comment.