- updated to 8.4.0

[packages/mysql.git] / no_relative_paths.patch

diff --git a/no_relative_paths.patch b/no_relative_paths.patch
index dfac7dd9b5c0b37254c49959077eba035bcdbd23..74213d51676ef7ca96a4f43c31819a4fd0aa9714 100644 (file)
--- a/no_relative_paths.patch
+++ b/no_relative_paths.patch
@@ -1,7 +1,7 @@
-diff -urNpa mysql-8.2.0.orig/sql/mysqld.cc mysql-8.2.0/sql/mysqld.cc
---- mysql-8.2.0.orig/sql/mysqld.cc     2023-12-30 12:55:09.027295242 +0100
-+++ mysql-8.2.0/sql/mysqld.cc  2023-12-30 13:03:21.431172893 +0100
-@@ -1967,7 +1967,6 @@ static void add_terminator(vector<my_opt
+diff -urNpa mysql-8.4.0.orig/sql/mysqld.cc mysql-8.4.0/sql/mysqld.cc
+--- mysql-8.4.0.orig/sql/mysqld.cc     2024-05-09 14:56:29.863000671 +0200
++++ mysql-8.4.0/sql/mysqld.cc  2024-05-09 14:56:52.199313987 +0200
+@@ -1954,7 +1954,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.2.0.orig/sql/mysqld.cc mysql-8.2.0/sql/mysqld.cc
  static int fix_paths(void);
  static int test_if_case_insensitive(const char *dir_name);
  static void end_ssl();
-@@ -7880,7 +7879,7 @@ static char *get_icu_data_directory_in_b
+@@ -7732,7 +7731,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.2.0.orig/sql/mysqld.cc mysql-8.2.0/sql/mysqld.cc
    if (test_if_hard_path(mysql_icu_datadir))
      strmake(buff, mysql_icu_datadir, sizeof(buff) - 1);
    else
-@@ -8987,7 +8986,7 @@ class Plugin_and_data_dir_option_parser
+@@ -8820,7 +8819,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.2.0.orig/sql/mysqld.cc mysql-8.2.0/sql/mysqld.cc
                      NullS);
      (void)my_load_path(local_plugindir_buffer, local_plugindir_buffer,
                         mysql_home);
-@@ -9077,7 +9076,7 @@ int mysqld_main(int argc, char **argv)
-   }
+@@ -8915,7 +8914,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.2.0.orig/sql/mysqld.cc mysql-8.2.0/sql/mysqld.cc
            sizeof(mysql_real_data_home) - 1);
  
    /* Must be initialized early for comparison of options name */
-@@ -13040,15 +13039,6 @@ static void set_server_version(void) {
+@@ -12784,15 +12783,6 @@ static void set_server_version(void) {
  #endif
  }
  
@@ -52,7 +52,7 @@ diff -urNpa mysql-8.2.0.orig/sql/mysqld.cc mysql-8.2.0/sql/mysqld.cc
  /**
    Test a file path to determine if the path is compatible with the secure file
    path restriction.
-@@ -13273,7 +13263,7 @@ static int fix_paths(void) {
+@@ -13010,7 +13000,7 @@ static int fix_paths(void) {
  
    convert_dirname(
        opt_plugin_dir,
@@ -61,7 +61,7 @@ diff -urNpa mysql-8.2.0.orig/sql/mysqld.cc mysql-8.2.0/sql/mysqld.cc
        NullS);
    (void)my_load_path(opt_plugin_dir, opt_plugin_dir, mysql_home);
    opt_plugin_dir_ptr = opt_plugin_dir;
-@@ -13284,7 +13274,7 @@ static int fix_paths(void) {
+@@ -13021,7 +13011,7 @@ static int fix_paths(void) {
        FN_LIBCHAR)
      --mysql_unpacked_real_data_home_len;