- updated to 8.0.37

[packages/mysql.git] / no_relative_paths.patch

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;