- updated to 8.0.37

diff --git a/mysql-cmake.patch b/mysql-cmake.patch
index ac380811704a8008c467b7433aeb4d8edc1ef035..da5340062c00b39f52849c7a19f1682aab870b5b 100644 (file)
--- a/mysql-cmake.patch
+++ b/mysql-cmake.patch
@@ -1,7 +1,7 @@
-diff -ruN mysql-5.7.21.orig/cmake/readline.cmake mysql-5.7.21/cmake/readline.cmake
---- mysql-5.7.21.orig/cmake/readline.cmake     2017-12-28 04:46:26.000000000 +0100
-+++ mysql-5.7.21/cmake/readline.cmake  2018-03-31 21:17:28.373826351 +0200
-@@ -110,23 +110,23 @@ ENDMACRO()
+diff -urNpa mysql-8.0.37.orig/cmake/readline.cmake mysql-8.0.37/cmake/readline.cmake
+--- mysql-8.0.37.orig/cmake/readline.cmake     2024-05-09 12:10:47.722921594 +0200
++++ mysql-8.0.37/cmake/readline.cmake  2024-05-09 12:12:37.116443611 +0200
+@@ -130,23 +130,23 @@ ENDMACRO()
  
  MACRO (FIND_SYSTEM_EDITLINE)
    FIND_PATH(FOUND_EDITLINE_READLINE
@@ -29,7 +29,7 @@ diff -ruN mysql-5.7.21.orig/cmake/readline.cmake mysql-5.7.21/cmake/readline.cma
    )
    MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
  
-@@ -139,7 +139,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
+@@ -162,7 +162,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
      LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
      CHECK_CXX_SOURCE_COMPILES("
      #include <stdio.h>
@@ -38,7 +38,7 @@ diff -ruN mysql-5.7.21.orig/cmake/readline.cmake mysql-5.7.21/cmake/readline.cma
      int main(int argc, char **argv)
      {
         HIST_ENTRY entry;
-@@ -149,14 +149,13 @@ MACRO (FIND_SYSTEM_EDITLINE)
+@@ -172,14 +172,13 @@ MACRO (FIND_SYSTEM_EDITLINE)
  
      CHECK_CXX_SOURCE_COMPILES("
      #include <stdio.h>
@@ -58,7 +58,7 @@ diff -ruN mysql-5.7.21.orig/cmake/readline.cmake mysql-5.7.21/cmake/readline.cma
      }"
      EDITLINE_HAVE_COMPLETION_INT)
  
-@@ -168,7 +167,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
+@@ -191,7 +190,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
        typedef char* MYFunction(const char*, int);
        MYFunction* myf= rl_completion_entry_function;
        char *res= (myf)(NULL, 0);

diff --git a/mysql-readline.patch b/mysql-readline.patch
index ca2af0668c8745f1be45a0c7332a3ec5ddfdf1c1..b8f564aabbd4d986c5c65ce9edd6c57365f5bcff 100644 (file)
--- a/mysql-readline.patch
+++ b/mysql-readline.patch
@@ -1,6 +1,7 @@
---- mysql-8.0.20/client/mysql.cc~      2020-05-12 19:39:17.000000000 +0200
-+++ mysql-8.0.20/client/mysql.cc       2020-05-12 19:49:31.903300850 +0200
-@@ -79,6 +79,7 @@
+diff -urNpa mysql-8.0.37.orig/client/mysql.cc mysql-8.0.37/client/mysql.cc
+--- mysql-8.0.37.orig/client/mysql.cc  2024-05-09 12:13:14.356961750 +0200
++++ mysql-8.0.37/client/mysql.cc       2024-05-09 12:13:39.849316431 +0200
+@@ -82,6 +82,7 @@ Foundation, Inc., 51 Franklin St, Fifth
  #define LOG_USER 0
  #else
  #include <readline.h>
@@ -8,7 +9,7 @@
  #include <syslog.h>
  
  #define HAVE_READLINE
-@@ -1134,22 +1134,6 @@ static COMMANDS commands[] = {
+@@ -1153,22 +1154,6 @@ static COMMANDS commands[] = {
  static const char *load_default_groups[] = {"mysql", "client", nullptr};
  
  #ifdef HAVE_READLINE

diff --git a/mysql-system-xxhash.patch b/mysql-system-xxhash.patch
index c2f9f499a2e3acdfc38945e8b33a4b4a919a61a5..8cab7d233994a08585a078ef2b0452feab5c1e7a 100644 (file)
--- a/mysql-system-xxhash.patch
+++ b/mysql-system-xxhash.patch
@@ -1,7 +1,7 @@
-diff -ur mysql-8.0.35.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt mysql-8.0.35/plugin/group_replication/libmysqlgcs/CMakeLists.txt
---- mysql-8.0.35.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt      2023-12-17 22:05:20.830721323 +0100
-+++ mysql-8.0.35/plugin/group_replication/libmysqlgcs/CMakeLists.txt   2023-12-17 22:07:25.296271792 +0100
-@@ -137,7 +137,6 @@
+diff -urNpa mysql-8.0.37.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt mysql-8.0.37/plugin/group_replication/libmysqlgcs/CMakeLists.txt
+--- mysql-8.0.37.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt      2024-05-09 12:06:10.435063653 +0200
++++ mysql-8.0.37/plugin/group_replication/libmysqlgcs/CMakeLists.txt   2024-05-09 12:06:48.667595584 +0200
+@@ -138,7 +138,6 @@ SET(GCS_SOURCES
    src/bindings/xcom/gcs_xcom_statistics_interface.cc
    src/bindings/xcom/gcs_xcom_proxy.cc
    src/bindings/xcom/gcs_xcom_communication_protocol_changer.cc
@@ -9,7 +9,7 @@ diff -ur mysql-8.0.35.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt m
    src/bindings/xcom/gcs_message_stage_split.cc
    src/bindings/xcom/gcs_xcom_synode.cc
    src/bindings/xcom/gcs_xcom_expels_in_progress.cc)
-@@ -230,6 +229,7 @@
+@@ -231,6 +230,7 @@ ADD_LIBRARY(mysqlgcs STATIC ${XCOM_SOURC
  # Dependency on mysys from gcs_logging_system.cc
  # but pick up symbols from the server:
  # TARGET_LINK_LIBRARIES(mysqlgcs mysys)
@@ -17,10 +17,10 @@ diff -ur mysql-8.0.35.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt m
  
  IF(LINUX AND WITH_TIRPC STREQUAL "bundled")
    ADD_DEPENDENCIES(mysqlgcs tirpc_ext)
-diff -ur mysql-8.0.35.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc mysql-8.0.35/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc
---- mysql-8.0.35.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc        2023-12-17 22:05:20.832721348 +0100
-+++ mysql-8.0.35/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc     2023-12-17 22:07:25.295271780 +0100
-@@ -126,7 +126,7 @@
+diff -urNpa mysql-8.0.37.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc mysql-8.0.37/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc
+--- mysql-8.0.37.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc        2024-05-09 12:06:10.435063653 +0200
++++ mysql-8.0.37/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc     2024-05-09 12:06:48.667595584 +0200
+@@ -127,7 +127,7 @@ Gcs_sender_id calculate_sender_id(const
    std::string info(node.get_member_id().get_member_id());
    info.append(node.get_member_uuid().actual_value);
  
@@ -29,10 +29,10 @@ diff -ur mysql-8.0.35.orig/plugin/group_replication/libmysqlgcs/src/bindings/xco
  }
  
  bool Gcs_message_stage_split_v2::update_members_information(
-diff -ur mysql-8.0.35.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h mysql-8.0.35/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h
---- mysql-8.0.35.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h      2023-12-17 22:05:20.834721373 +0100
-+++ mysql-8.0.35/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h   2023-12-17 22:07:25.296271792 +0100
-@@ -25,10 +25,6 @@
+diff -urNpa mysql-8.0.37.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h mysql-8.0.37/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h
+--- mysql-8.0.37.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h      2024-05-09 12:06:10.439063709 +0200
++++ mysql-8.0.37/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h   2024-05-09 12:06:48.667595584 +0200
+@@ -26,10 +26,6 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
  
@@ -44,10 +44,10 @@ diff -ur mysql-8.0.35.orig/plugin/group_replication/libmysqlgcs/src/bindings/xco
 +#include <xxhash.h>
  
  #endif  // GCS_XXHASH_H_INCLUDED
-diff -ur mysql-8.0.35.orig/sql/CMakeLists.txt mysql-8.0.35/sql/CMakeLists.txt
---- mysql-8.0.35.orig/sql/CMakeLists.txt       2023-12-17 22:05:21.077724399 +0100
-+++ mysql-8.0.35/sql/CMakeLists.txt    2023-12-17 22:08:35.180142336 +0100
-@@ -762,7 +762,6 @@
+diff -urNpa mysql-8.0.37.orig/sql/CMakeLists.txt mysql-8.0.37/sql/CMakeLists.txt
+--- mysql-8.0.37.orig/sql/CMakeLists.txt       2024-05-09 12:06:08.783040668 +0200
++++ mysql-8.0.37/sql/CMakeLists.txt    2024-05-09 12:08:19.128854193 +0200
+@@ -762,7 +762,6 @@ SET(SQL_SOURCE
    ${CONF_SOURCES}
    ${SQL_SHARED_SOURCES}
    ${SQL_HEADERS}
@@ -55,7 +55,7 @@ diff -ur mysql-8.0.35.orig/sql/CMakeLists.txt mysql-8.0.35/sql/CMakeLists.txt
    ../libmysql/errmsg.cc
    ../sql-common/client.cc
    ../sql-common/client_plugin.cc
-@@ -818,11 +817,6 @@
+@@ -818,11 +817,6 @@ IF(WIN32)
        )
  ENDIF()
  
@@ -67,21 +67,21 @@ diff -ur mysql-8.0.35.orig/sql/CMakeLists.txt mysql-8.0.35/sql/CMakeLists.txt
  # Workaround for Apple Clang bug on ARM.
  # When linking mysqld (and executables using server_unittest_library)
  # we get linker warnings about
-@@ -847,13 +841,6 @@
-     )
+@@ -848,13 +842,6 @@ IF(APPLE_ARM)
  ENDIF()
  
--ADD_COMPILE_FLAGS(
+ ADD_COMPILE_FLAGS(
 -  ${BUNDLED_LZ4_PATH}/xxhash.c
 -  iterators/hash_join_iterator.cc
 -  rpl_write_set_handler.cc
 -  COMPILE_FLAGS -I${CMAKE_SOURCE_DIR}/extra/lz4 -I${BUNDLED_LZ4_PATH}
 -  )
 -
- # Fixes "C1128: number of sections exceeded object file format limit" in MSVC
- IF(WIN32)
-   ADD_COMPILE_FLAGS(
-@@ -941,7 +928,7 @@
+-ADD_COMPILE_FLAGS(
+   iterators/hash_join_buffer.cc
+   COMPILE_FLAGS
+   -I${CMAKE_SOURCE_DIR}/extra/unordered_dense/unordered_dense-4.4.0/include
+@@ -947,7 +934,7 @@ ADD_DEPENDENCIES(sql_main GenBootstrapPr
  ADD_DEPENDENCIES(sql_main GenSysSchema)
  TARGET_LINK_LIBRARIES(sql_main ${MYSQLD_STATIC_PLUGIN_LIBS}
    mysql_server_component_services mysys strings vio
@@ -90,19 +90,19 @@ diff -ur mysql-8.0.35.orig/sql/CMakeLists.txt mysql-8.0.35/sql/CMakeLists.txt
    extra::rapidjson)
  
  # sql/immutable_string.h uses
-diff -ur mysql-8.0.35.orig/sql/iterators/hash_join_iterator.cc mysql-8.0.35/sql/iterators/hash_join_iterator.cc
---- mysql-8.0.35.orig/sql/iterators/hash_join_iterator.cc      2023-12-17 22:05:21.366728000 +0100
-+++ mysql-8.0.35/sql/iterators/hash_join_iterator.cc   2023-12-17 22:07:25.297271805 +0100
-@@ -32,7 +32,7 @@
- #include "field_types.h"
- #include "my_alloc.h"
+diff -urNpa mysql-8.0.37.orig/sql/iterators/hash_join_iterator.cc mysql-8.0.37/sql/iterators/hash_join_iterator.cc
+--- mysql-8.0.37.orig/sql/iterators/hash_join_iterator.cc      2024-05-09 12:06:08.847041559 +0200
++++ mysql-8.0.37/sql/iterators/hash_join_iterator.cc   2024-05-09 12:09:27.329803079 +0200
+@@ -37,7 +37,7 @@
  #include "my_bit.h"
--#include "my_xxhash.h"
-+#include <xxhash.h>
- 
  #include "my_inttypes.h"
  #include "my_sys.h"
-@@ -307,7 +307,7 @@
+-#include "my_xxhash.h"
++#include <xxhash.h>
+ #include "mysql/components/services/bits/psi_bits.h"
+ #include "mysqld_error.h"
+ #include "sql/item.h"
+@@ -306,7 +306,7 @@ static bool WriteRowToChunk(
    const uint64_t join_key_hash =
        join_key_and_row_buffer->length() == 0
            ? kZeroKeyLengthHash
@@ -111,10 +111,10 @@ diff -ur mysql-8.0.35.orig/sql/iterators/hash_join_iterator.cc mysql-8.0.35/sql/
                       join_key_and_row_buffer->length(), xxhash_seed);
  
    assert((chunks->size() & (chunks->size() - 1)) == 0);
-diff -ur mysql-8.0.35.orig/sql/rpl_write_set_handler.cc mysql-8.0.35/sql/rpl_write_set_handler.cc
---- mysql-8.0.35.orig/sql/rpl_write_set_handler.cc     2023-12-17 22:05:21.611731051 +0100
-+++ mysql-8.0.35/sql/rpl_write_set_handler.cc  2023-12-17 22:07:25.297271805 +0100
-@@ -37,7 +37,7 @@
+diff -urNpa mysql-8.0.37.orig/sql/rpl_write_set_handler.cc mysql-8.0.37/sql/rpl_write_set_handler.cc
+--- mysql-8.0.37.orig/sql/rpl_write_set_handler.cc     2024-05-09 12:06:08.823041225 +0200
++++ mysql-8.0.37/sql/rpl_write_set_handler.cc  2024-05-09 12:06:48.667595584 +0200
+@@ -38,7 +38,7 @@
  #include "my_dbug.h"
  #include "my_inttypes.h"
  #include "my_murmur3.h"  // murmur3_32
@@ -123,7 +123,7 @@ diff -ur mysql-8.0.35.orig/sql/rpl_write_set_handler.cc mysql-8.0.35/sql/rpl_wri
  #include "mysql_com.h"
  #include "sql-common/json_binary.h"
  #include "sql-common/json_dom.h"
-@@ -75,7 +75,7 @@
+@@ -76,7 +76,7 @@ uint64 calc_hash(ulong algorithm, type T
    if (algorithm == HASH_ALGORITHM_MURMUR32)
      return (murmur3_32((const uchar *)T, len, 0));
    else
@@ -132,10 +132,10 @@ diff -ur mysql-8.0.35.orig/sql/rpl_write_set_handler.cc mysql-8.0.35/sql/rpl_wri
  }
  
  #ifndef NDEBUG
-diff -ur mysql-8.0.35.orig/unittest/gunit/hash_join-t.cc mysql-8.0.35/unittest/gunit/hash_join-t.cc
---- mysql-8.0.35.orig/unittest/gunit/hash_join-t.cc    2023-12-17 22:05:25.668781591 +0100
-+++ mysql-8.0.35/unittest/gunit/hash_join-t.cc 2023-12-17 22:08:05.509772732 +0100
-@@ -37,7 +37,7 @@
+diff -urNpa mysql-8.0.37.orig/unittest/gunit/hash_join-t.cc mysql-8.0.37/unittest/gunit/hash_join-t.cc
+--- mysql-8.0.37.orig/unittest/gunit/hash_join-t.cc    2024-05-09 12:06:10.551065267 +0200
++++ mysql-8.0.37/unittest/gunit/hash_join-t.cc 2024-05-09 12:06:48.667595584 +0200
+@@ -38,7 +38,7 @@
  #include "my_config.h"
  #include "my_inttypes.h"
  #include "my_murmur3.h"
@@ -144,7 +144,7 @@ diff -ur mysql-8.0.35.orig/unittest/gunit/hash_join-t.cc mysql-8.0.35/unittest/g
  #include "mysql/components/services/bits/psi_bits.h"
  #include "prealloced_array.h"
  #include "sql/field.h"
-@@ -226,7 +226,7 @@
+@@ -227,7 +227,7 @@ static void BM_XXHash64ShortData(size_t
  
    size_t sum = 0;
    for (size_t i = 0; i < num_iterations; ++i) {
@@ -153,7 +153,7 @@ diff -ur mysql-8.0.35.orig/unittest/gunit/hash_join-t.cc mysql-8.0.35/unittest/g
    }
    StopBenchmarkTiming();
  
-@@ -245,7 +245,7 @@
+@@ -246,7 +246,7 @@ static void BM_XXHash64LongData(size_t n
  
    size_t sum = 0;
    for (size_t i = 0; i < num_iterations; ++i) {
@@ -162,10 +162,10 @@ diff -ur mysql-8.0.35.orig/unittest/gunit/hash_join-t.cc mysql-8.0.35/unittest/g
    }
    StopBenchmarkTiming();
  
-diff -ur mysql-8.0.35.orig/unittest/gunit/innodb/ut0rnd-t.cc mysql-8.0.35/unittest/gunit/innodb/ut0rnd-t.cc
---- mysql-8.0.35.orig/unittest/gunit/innodb/ut0rnd-t.cc        2023-12-17 22:05:25.830783608 +0100
-+++ mysql-8.0.35/unittest/gunit/innodb/ut0rnd-t.cc     2023-12-17 22:07:25.298271817 +0100
-@@ -33,7 +33,7 @@
+diff -urNpa mysql-8.0.37.orig/unittest/gunit/innodb/ut0rnd-t.cc mysql-8.0.37/unittest/gunit/innodb/ut0rnd-t.cc
+--- mysql-8.0.37.orig/unittest/gunit/innodb/ut0rnd-t.cc        2024-05-09 12:06:10.551065267 +0200
++++ mysql-8.0.37/unittest/gunit/innodb/ut0rnd-t.cc     2024-05-09 12:06:48.667595584 +0200
+@@ -34,7 +34,7 @@
  #include "storage/innobase/include/ut0crc32.h"
  #include "storage/innobase/include/ut0rnd.h"
  

diff --git a/mysql.spec b/mysql.spec
index 8c922d1cecb13305b4a6003ddb64ef77f5d92653..a20a4f22418c4c046ba34573167db24c3b8c847f 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,4 +1,4 @@
-# Conditional build:
+# Condition1al build:
 %bcond_without innodb          # InnoDB storage engine support
 %bcond_without big_tables      # Support tables with more than 4G rows even on 32 bit platforms
 %bcond_without federated       # Federated storage engine support
@@ -25,12 +25,12 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql-%{mysqlversion}
-Version:       8.0.36
-Release:        2
+Version:       8.0.37
+Release:        1
 License:       GPL v2 + MySQL FOSS License Exception
 Group:         Applications/Databases
 Source0:       http://cdn.mysql.com/Downloads/MySQL-%{mysqlversion}/mysql-%{version}.tar.gz
-# Source0-md5: 08bc8e4307246e77d013267e2cd8fa49
+# Source0-md5: 273a2f2a8149928974a63043a7224405
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:       5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}

diff --git a/no_relative_paths.patch b/no_relative_paths.patch
index 9238d383df565c02a84fa2147b3e97b1d5539aa5..452bf13319ed50f605197605d0ec228df1f3a65f 100644 (file)
--- a/no_relative_paths.patch
+++ b/no_relative_paths.patch
@@ -1,7 +1,7 @@
-diff -urNpa mysql-8.0.35.orig/sql/mysqld.cc mysql-8.0.35/sql/mysqld.cc
---- mysql-8.0.35.orig/sql/mysqld.cc    2023-12-20 23:22:13.694682253 +0100
-+++ mysql-8.0.35/sql/mysqld.cc 2023-12-20 23:33:27.807838185 +0100
-@@ -1956,7 +1956,6 @@ static void add_terminator(vector<my_opt
+diff -urNpa mysql-8.0.37.orig/sql/mysqld.cc mysql-8.0.37/sql/mysqld.cc
+--- mysql-8.0.37.orig/sql/mysqld.cc    2024-05-09 12:03:11.592583190 +0200
++++ mysql-8.0.37/sql/mysqld.cc 2024-05-09 12:03:54.597177666 +0200
+@@ -1966,7 +1966,6 @@ static void add_terminator(vector<my_opt
  extern "C" bool mysqld_get_one_option(int, const struct my_option *, char *);
  static void set_server_version(void);
  static int init_thread_environment();
@@ -9,7 +9,7 @@ diff -urNpa mysql-8.0.35.orig/sql/mysqld.cc mysql-8.0.35/sql/mysqld.cc
  static int fix_paths(void);
  static int test_if_case_insensitive(const char *dir_name);
  static void end_ssl();
-@@ -6095,7 +6094,7 @@ static char *get_icu_data_directory_in_b
+@@ -6121,7 +6120,7 @@ static char *get_icu_data_directory_in_b
  // Look for MYSQL_ICU_DATADIR which depends on INSTALL_PRIV_LIBDIR
  static char *get_icu_data_directory_in_install_dir(char *to) {
    char buff[FN_REFLEN];
@@ -18,7 +18,7 @@ diff -urNpa mysql-8.0.35.orig/sql/mysqld.cc mysql-8.0.35/sql/mysqld.cc
    if (test_if_hard_path(mysql_icu_datadir))
      strmake(buff, mysql_icu_datadir, sizeof(buff) - 1);
    else
-@@ -7196,7 +7195,7 @@ class Plugin_and_data_dir_option_parser
+@@ -7221,7 +7220,7 @@ class Plugin_and_data_dir_option_parser
      memset(dir, 0, FN_REFLEN);
  
      convert_dirname(local_plugindir_buffer,
@@ -27,8 +27,8 @@ diff -urNpa mysql-8.0.35.orig/sql/mysqld.cc mysql-8.0.35/sql/mysqld.cc
                      NullS);
      (void)my_load_path(local_plugindir_buffer, local_plugindir_buffer,
                         mysql_home);
-@@ -7286,7 +7285,7 @@ int mysqld_main(int argc, char **argv)
-   }
+@@ -7316,7 +7315,7 @@ int mysqld_main(int argc, char **argv)
+   argv_cached[argc_cached] = nullptr;
  
    /* Set data dir directory paths */
 -  strmake(mysql_real_data_home, get_relative_path(MYSQL_DATADIR),
@@ -36,7 +36,7 @@ diff -urNpa mysql-8.0.35.orig/sql/mysqld.cc mysql-8.0.35/sql/mysqld.cc
            sizeof(mysql_real_data_home) - 1);
  
    /* Must be initialized early for comparison of options name */
-@@ -11212,15 +11211,6 @@ static void set_server_version(void) {
+@@ -11266,15 +11265,6 @@ static void set_server_version(void) {
  #endif
  }
  
@@ -52,7 +52,7 @@ diff -urNpa mysql-8.0.35.orig/sql/mysqld.cc mysql-8.0.35/sql/mysqld.cc
  /**
    Test a file path to determine if the path is compatible with the secure file
    path restriction.
-@@ -11445,7 +11435,7 @@ static int fix_paths(void) {
+@@ -11492,7 +11482,7 @@ static int fix_paths(void) {
  
    convert_dirname(
        opt_plugin_dir,
@@ -61,7 +61,7 @@ diff -urNpa mysql-8.0.35.orig/sql/mysqld.cc mysql-8.0.35/sql/mysqld.cc
        NullS);
    (void)my_load_path(opt_plugin_dir, opt_plugin_dir, mysql_home);
    opt_plugin_dir_ptr = opt_plugin_dir;
-@@ -11456,7 +11446,7 @@ static int fix_paths(void) {
+@@ -11503,7 +11493,7 @@ static int fix_paths(void) {
        FN_LIBCHAR)
      --mysql_unpacked_real_data_home_len;