9.0.1 (#102)

automerged PR by conda-forge/automerge-action

recipe/meta.yaml

@@ -1,12 +1,12 @@
-{% set version = "8.4.2" %}
+{% set version = "9.0.1" %}
 
 package:
   name: mysql-suite
   version: {{ version }}
 
 source:
-  url: https://cdn.mysql.com/Downloads/MySQL-8.4/mysql-{{ version }}.tar.gz
-  sha256: 5657a78dc86bf0bf2227e0b05f8de5a2c447a816a112ffa26fa70083bcbe9814
+  url: https://cdn.mysql.com/Downloads/MySQL-9.0/mysql-{{ version }}.tar.gz
+  sha256: 18fa65f1ea6aea71e418fe0548552d9a28de68e2b8bc3ba9536599eb459a6606
   patches:
     - patches/0001-Make-installation-of-pdb-files-optional.patch
     - patches/0002-Fix-file-path-for-mysqlrouter.conf.sample-for-instal.patch

recipe/patches/0001-Make-installation-of-pdb-files-optional.patch

@@ -1,4 +1,4 @@
-From f60715807fcf0da4e9940c8890cd601b141551af Mon Sep 17 00:00:00 2001
+From bde178291b9dc22a07c8873adcc267a9db7d3509 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sun, 21 Jun 2020 13:06:08 -0400
 Subject: [PATCH 01/21] Make installation of pdb files optional

recipe/patches/0002-Fix-file-path-for-mysqlrouter.conf.sample-for-instal.patch

@@ -1,4 +1,4 @@
-From 1b86737a08f2abbb26fbf3487d858c54466c6001 Mon Sep 17 00:00:00 2001
+From 39a5cbfa2ebb9438c168538f2780cb4d3ef8559d Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sun, 21 Jun 2020 16:15:08 -0400
 Subject: [PATCH 02/21] Fix file path for mysqlrouter.conf.sample for

recipe/patches/0003-Allow-flags-other-than-macros-in-CPPFLAGS.patch

@@ -1,4 +1,4 @@
-From d74e52fdf9df5dbe67cd3a6026a99473fb65d68b Mon Sep 17 00:00:00 2001
+From c1680e5af6ae95cca7f31c1b6c3a702305cf18bf Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Mon, 22 Jun 2020 09:53:55 -0400
 Subject: [PATCH 03/21] Allow flags other than macros in CPPFLAGS
@@ -8,7 +8,7 @@ Subject: [PATCH 03/21] Allow flags other than macros in CPPFLAGS
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ce74508addf..19e7a05f427 100644
+index 438dff720c5..2ce44db3c54 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -654,7 +654,9 @@ ENDFOREACH()

recipe/patches/0004-Add-include-header-for-std-string.patch

@@ -1,4 +1,4 @@
-From 185a23d253aa5efb79e28ddd6f8d6def87630d7a Mon Sep 17 00:00:00 2001
+From 618a6eccd88e27682ddab96ee5a5146eadbf01f0 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Mon, 19 Oct 2020 23:48:16 -0400
 Subject: [PATCH 04/21] Add include header for std::string

recipe/patches/0005-Remove-forceful-injection-of-debug-info.patch

@@ -1,4 +1,4 @@
-From ac543f5ff316e57644375552d593769b2fbc3072 Mon Sep 17 00:00:00 2001
+From b3205ac43fcb8e5a051ddf6a3320caf2532757b0 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Thu, 23 Jul 2020 12:56:13 -0400
 Subject: [PATCH 05/21] Remove forceful injection of debug info

recipe/patches/0006-Link-libgcc-libstdc-statically-for-codgen-binaries.patch

@@ -1,4 +1,4 @@
-From 5acbabf3eb3eda65eefb026a1d0b9daaf8db9b8f Mon Sep 17 00:00:00 2001
+From b7fa41d88191bff2b6248b79cfafca1dbb518fc9 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Fri, 14 Aug 2020 20:30:20 -0400
 Subject: [PATCH 06/21] Link libgcc & libstdc++ statically for codgen binaries
@@ -9,7 +9,7 @@ Makes it easier for cross compilation
  1 file changed, 13 insertions(+)
 
 diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
-index fce0e979876..544f5d02b63 100644
+index fc362296c4f..68de6622513 100644
 --- a/sql/CMakeLists.txt
 +++ b/sql/CMakeLists.txt
 @@ -71,6 +71,10 @@ MYSQL_ADD_EXECUTABLE(gen_lex_token
@@ -35,7 +35,7 @@ index fce0e979876..544f5d02b63 100644
 
  IF(WITH_LTO OR CMAKE_COMPILER_FLAG_WITH_LTO)
    TARGET_COMPILE_OPTIONS(gen_keyword_list PRIVATE "-fno-lto")
-@@ -1393,6 +1402,10 @@ SET_SOURCE_FILES_PROPERTIES(
+@@ -1397,6 +1406,10 @@ SET_SOURCE_FILES_PROPERTIES(
 
  # Gen_lex_hash
  MYSQL_ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc SKIP_INSTALL)

recipe/patches/0007-Add-dependency-on-comp_err-iff-that-target-exists.patch

@@ -1,4 +1,4 @@
-From dad5f95b878394b7b1888c011f035b3e0e754c54 Mon Sep 17 00:00:00 2001
+From ca520144868ffffa778d74c7edea336588b1e5aa Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sat, 30 Jan 2021 19:48:42 -0500
 Subject: [PATCH 07/21] Add dependency on comp_err iff that target exists

recipe/patches/0008-Add-constructor-s-for-ut-Location.patch

@@ -1,4 +1,4 @@
-From 0d97f0b3a31ab859b9e16a165345864aa4af95bc Mon Sep 17 00:00:00 2001
+From 49821b17defce700f117fad37192453c73c25a6a Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Thu, 22 Apr 2021 09:32:37 -0400
 Subject: [PATCH 08/21] Add constructor(s) for ut::Location

recipe/patches/0009-Reduce-number-of-symbols-being-exported-from-mysqld..patch

@@ -1,4 +1,4 @@
-From 4b218b79978527bfbdd41956853748f0e690acf9 Mon Sep 17 00:00:00 2001
+From 22bdc94103715d3a4e64ef9950afe5d7fac8413b Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sun, 9 May 2021 17:29:26 -0400
 Subject: [PATCH 09/21] Reduce number of symbols being exported from mysqld.exe

recipe/patches/0010-Ensure-sql_main-uses-protobuf-shared-library-correct.patch

@@ -1,4 +1,4 @@
-From 4fffd07c50a5bb20f6e687c3cbf22a87d4e0218a Mon Sep 17 00:00:00 2001
+From d781ecb9003cd5f1c60fae8c853175f0b32a83e8 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Tue, 12 Oct 2021 07:53:59 -0400
 Subject: [PATCH 10/21] Ensure sql_main uses protobuf shared library correctly
@@ -8,10 +8,10 @@ Subject: [PATCH 10/21] Ensure sql_main uses protobuf shared library correctly
  1 file changed, 1 insertion(+)
 
 diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
-index 544f5d02b63..418e8e29d61 100644
+index 68de6622513..830c59ba433 100644
 --- a/sql/CMakeLists.txt
 +++ b/sql/CMakeLists.txt
-@@ -981,6 +981,7 @@ TARGET_LINK_LIBRARIES(sql_main ${MYSQLD_STATIC_PLUGIN_LIBS}
+@@ -991,6 +991,7 @@ TARGET_LINK_LIBRARIES(sql_main ${MYSQLD_STATIC_PLUGIN_LIBS}
  # sql/immutable_string.h uses
  # google::protobuf::io::CodedOutputStream::WriteVarint64ToArray
  # which may or may not be inlined.

recipe/patches/0011-Include-missing-header-for-std-isdigit.patch

@@ -1,4 +1,4 @@
-From feb1209f7e3965475ce8e174dab74a3f3611da3d Mon Sep 17 00:00:00 2001
+From 33adb189d03a9a31032c1ef142ad99dbfb1f7ead Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Wed, 21 Jul 2021 00:55:54 +0530
 Subject: [PATCH 11/21] Include missing header for std::isdigit()

recipe/patches/0012-Print-number-of-lines-in-the-file-generated-by-creat.patch

@@ -1,4 +1,4 @@
-From 9c9fd85e830c2d259ee76a1af77deb5d5a951f62 Mon Sep 17 00:00:00 2001
+From ac89e56536feb087c4c1f8d782125f7de2ed412b Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sat, 23 Oct 2021 10:31:04 -0400
 Subject: [PATCH 12/21] Print number of lines in the file generated by
@@ -9,10 +9,10 @@ Subject: [PATCH 12/21] Print number of lines in the file generated by
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
-index 418e8e29d61..9b18a389077 100644
+index 830c59ba433..5005f4fbf71 100644
 --- a/sql/CMakeLists.txt
 +++ b/sql/CMakeLists.txt
-@@ -1292,7 +1292,8 @@ IF(MSVC)
+@@ -1296,7 +1296,8 @@ IF(MSVC)
      DEPENDS create_def binlog mysql_binlog_event mysys mytime rpl rpl_replica sql_main strings vio
    )
    MY_ADD_CUSTOM_TARGET(GenMysqldDef ALL

recipe/patches/0013-Check-for-ARMv8-crc32-intrinsic-support-on-osx-arm64.patch

@@ -1,4 +1,4 @@
-From 92363a0a5212688b6bca0cf8ecf42010a67c45c5 Mon Sep 17 00:00:00 2001
+From 567a3bac7896df66af4ccc1b010a1f40906afb10 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sun, 24 Oct 2021 14:20:06 -0400
 Subject: [PATCH 13/21] Check for ARMv8 crc32 intrinsic support on osx-arm64

recipe/patches/0014-Revert-Bug-30981914-COMPILE-WITH-FASTER-TLS-MODEL.patch

@@ -1,4 +1,4 @@
-From 6e83739d350c756bbd16cd033f2c612aab2e9799 Mon Sep 17 00:00:00 2001
+From ac2a441a2e320a0ecb2b22140fd6b918bcd7bd5f Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sat, 18 Dec 2021 16:57:08 -0500
 Subject: [PATCH 14/21] Revert "Bug #30981914: COMPILE WITH FASTER TLS MODEL"

recipe/patches/0015-Zlib-module-use-macro-instead-of-function.patch

@@ -1,4 +1,4 @@
-From e89ac68dee0dcd96a8b45286f15fcc2ad9be367e Mon Sep 17 00:00:00 2001
+From 6914e217d3588eb87f81511b3a0da0bd28f96a92 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Thu, 27 Apr 2023 11:53:31 +0530
 Subject: [PATCH 15/21] Zlib module: use macro instead of function

recipe/patches/0016-Make-get_relative_path-binary-patching-friendly.patch

@@ -1,4 +1,4 @@
-From 2fcd188f46999359119b4bd3df0d29bd5d7865c3 Mon Sep 17 00:00:00 2001
+From ed49e50e498301a829be18899da945f544a9afb8 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sun, 18 Jun 2023 23:44:06 +0100
 Subject: [PATCH 16/21] Make get_relative_path() binary patching friendly
@@ -9,10 +9,10 @@ The call to strlen() can be optimized away by the compiler
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/sql/mysqld.cc b/sql/mysqld.cc
-index a6ef7b135e4..683b1286db9 100644
+index 7d362a9960a..7a871709d16 100644
 --- a/sql/mysqld.cc
 +++ b/sql/mysqld.cc
-@@ -12798,9 +12798,12 @@ static void set_server_version(void) {
+@@ -12856,9 +12856,12 @@ static void set_server_version(void) {
  }
 
  static const char *get_relative_path(const char *path) {

recipe/patches/0017-Revert-BUG-34849343-Aligned_atomic-not-working-as-in.patch

@@ -1,4 +1,4 @@
-From 5a68044b3ae48bc01f388204a6b1c1f15b659e48 Mon Sep 17 00:00:00 2001
+From d6c23bef7007ed652124668589d260ed1d971fb4 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sun, 18 Jun 2023 15:40:42 +0100
 Subject: [PATCH 17/21] Revert "BUG#34849343 Aligned_atomic not working as

recipe/patches/0018-Make-libfido-checks-conditional.patch

@@ -1,4 +1,4 @@
-From 585a00f071e2dc0e56bd2fa6760d599cc860f8dc Mon Sep 17 00:00:00 2001
+From fc5d5deda324536a4952396c448a5f02a73a9d78 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Mon, 19 Jun 2023 20:25:57 +0100
 Subject: [PATCH 18/21] Make libfido checks conditional
@@ -8,10 +8,10 @@ Subject: [PATCH 18/21] Make libfido checks conditional
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 19e7a05f427..30a44a102d0 100644
+index 2ce44db3c54..5f2d137d7a1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1943,8 +1943,10 @@ ENDIF()
+@@ -1947,8 +1947,10 @@ ENDIF()
  MYSQL_CHECK_RAPIDJSON()
 
  # Look for fido2 library

recipe/patches/0019-Don-t-include-headers-from-Homebrew.patch

@@ -1,4 +1,4 @@
-From 46eabe57d31b12368198a8b508f05d7f165043cc Mon Sep 17 00:00:00 2001
+From 96fb470bd56d86b7f70523158d976da9c7b363c5 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Wed, 21 Feb 2024 16:30:32 +0100
 Subject: [PATCH 19/21] Don't include headers from Homebrew
@@ -12,7 +12,7 @@ Subject: [PATCH 19/21] Don't include headers from Homebrew
  5 files changed, 83 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 30a44a102d0..148c8cc00b9 100644
+index 5f2d137d7a1..87f4c93af5e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1691,17 +1691,6 @@ SET(SYSTEM_LIBRARIES
@@ -33,7 +33,7 @@ index 30a44a102d0..148c8cc00b9 100644
  SET(WITH_SYSTEM_LIBS_DEFAULT OFF)
  OPTION(WITH_SYSTEM_LIBS
    "Use -DWITH_XXX=system for ${SYSTEM_LIBRARIES}" ${WITH_SYSTEM_LIBS_DEFAULT})
-@@ -1948,31 +1937,6 @@ IF(WITH_AUTHENTICATION_CLIENT_PLUGINS)
+@@ -1952,31 +1941,6 @@ IF(WITH_AUTHENTICATION_CLIENT_PLUGINS)
    MYSQL_CHECK_FIDO_DLLS()
  ENDIF()
 

recipe/patches/0020-Use-config-mode-search-for-protobuf-first.patch

@@ -1,4 +1,4 @@
-From f9a1baeb7a836b9e64d43baf21f5914373c62870 Mon Sep 17 00:00:00 2001
+From 532228cb8e47b69633e71b8f21b29a478257b4f6 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sun, 11 Jun 2023 23:26:01 +0100
 Subject: [PATCH 20/21] Use config mode search for protobuf first
@@ -13,10 +13,10 @@ See also: https://gitlab.kitware.com/cmake/cmake/-/issues/24321
  1 file changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake
-index c0e20c52e5a..e4d0bf2a551 100644
+index bfcd8377576..9b5b391b453 100644
 --- a/cmake/protobuf.cmake
 +++ b/cmake/protobuf.cmake
-@@ -121,7 +121,22 @@ MACRO(MYSQL_CHECK_PROTOBUF)
+@@ -123,7 +123,22 @@ MACRO(MYSQL_CHECK_PROTOBUF)
    IF(WITH_PROTOBUF STREQUAL "bundled")
      MYSQL_USE_BUNDLED_PROTOBUF()
    ELSE()

recipe/patches/0021-Simplify-protobuf-deps-using-cmake-alias.patch

@@ -1,4 +1,4 @@
-From 5eede58c8dd0a68887b33df27b99050ee1730b5f Mon Sep 17 00:00:00 2001
+From 9a973a15f818413f0aaedb359786efb426aa9ef3 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Wed, 7 Aug 2024 12:25:14 +0100
 Subject: [PATCH 21/21] Simplify protobuf deps using cmake alias
@@ -8,10 +8,10 @@ Subject: [PATCH 21/21] Simplify protobuf deps using cmake alias
  1 file changed, 3 insertions(+), 46 deletions(-)
 
 diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake
-index e4d0bf2a551..8d5e85b6deb 100644
+index 9b5b391b453..d450a0c80bb 100644
 --- a/cmake/protobuf.cmake
 +++ b/cmake/protobuf.cmake
-@@ -163,55 +163,12 @@ MACRO(MYSQL_CHECK_PROTOBUF)
+@@ -165,55 +165,12 @@ MACRO(MYSQL_CHECK_PROTOBUF)
      # ADD_LIBRARY(ext::libprotobuf-lite ALIAS libprotobuf-lite)
      # ADD_LIBRARY(ext::libprotoc ALIAS libprotoc)
    ELSE()