- updated to 8.4.4, use %patch -P

diff --git a/mysql-readline.patch b/mysql-readline.patch
index 011fe9587081ef72c1feae6c70f254d923bbb5a0..bb26141dcd46b7cd2a8e34535a67ded86e7b9a08 100644 (file)
--- a/mysql-readline.patch
+++ b/mysql-readline.patch
@@ -1,6 +1,6 @@
-diff -urNpa mysql-8.4.0.orig/client/mysql.cc mysql-8.4.0/client/mysql.cc
---- mysql-8.4.0.orig/client/mysql.cc   2024-05-09 15:04:59.682084155 +0200
-+++ mysql-8.4.0/client/mysql.cc        2024-05-09 15:05:11.982254902 +0200
+diff -urNpa mysql-8.4.4.orig/client/mysql.cc mysql-8.4.4/client/mysql.cc
+--- mysql-8.4.4.orig/client/mysql.cc   2025-02-20 23:13:30.590476312 +0100
++++ mysql-8.4.4/client/mysql.cc        2025-02-20 23:15:26.195920130 +0100
 @@ -93,6 +93,7 @@ Foundation, Inc., 51 Franklin St, Fifth
  #define LOG_USER 0
  #else
@@ -9,7 +9,7 @@ diff -urNpa mysql-8.4.0.orig/client/mysql.cc mysql-8.4.0/client/mysql.cc
  #include <syslog.h>
  
  #define HAVE_READLINE
-@@ -1185,22 +1186,6 @@ static COMMANDS commands[] = {
+@@ -1186,22 +1187,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 d54a1ca1e9be214954efb73dbdf51fe4c4e0e8af..a32d94b311581ecc3cacea060879e31acd2c5aee 100644 (file)
--- a/mysql-system-xxhash.patch
+++ b/mysql-system-xxhash.patch
@@ -1,6 +1,6 @@
-diff -urNpa mysql-8.4.3.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt mysql-8.4.3/plugin/group_replication/libmysqlgcs/CMakeLists.txt
---- mysql-8.4.3.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt       2024-12-04 01:34:56.142218563 +0100
-+++ mysql-8.4.3/plugin/group_replication/libmysqlgcs/CMakeLists.txt    2024-12-04 01:38:54.885959476 +0100
+diff -urNpa mysql-8.4.4.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt mysql-8.4.4/plugin/group_replication/libmysqlgcs/CMakeLists.txt
+--- mysql-8.4.4.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt       2025-02-20 23:09:06.447177328 +0100
++++ mysql-8.4.4/plugin/group_replication/libmysqlgcs/CMakeLists.txt    2025-02-20 23:09:21.411364216 +0100
 @@ -138,7 +138,6 @@ SET(GCS_SOURCES
    src/bindings/xcom/gcs_xcom_statistics_interface.cc
    src/bindings/xcom/gcs_xcom_proxy.cc
@@ -15,11 +15,11 @@ diff -urNpa mysql-8.4.3.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt
  # TARGET_LINK_LIBRARIES(mysqlgcs mysys)
 +TARGET_LINK_LIBRARIES(mysqlgcs PUBLIC xxhash)
  
- IF(CMAKE_VERSION VERSION_GREATER "3.19" AND NOT APPLE_XCODE)
-   # New in version 3.19:
-diff -urNpa mysql-8.4.3.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc mysql-8.4.3/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc
---- mysql-8.4.3.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc 2024-12-04 01:34:56.142218563 +0100
-+++ mysql-8.4.3/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc      2024-12-04 01:38:54.885959476 +0100
+ # Lots of C-style casting in the interface to XDR functions.
+ #   xcom_xdr_free((xdrproc_t)proc ...)
+diff -urNpa mysql-8.4.4.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc mysql-8.4.4/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc
+--- mysql-8.4.4.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc 2025-02-20 23:09:06.447177328 +0100
++++ mysql-8.4.4/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc      2025-02-20 23:09:21.411364216 +0100
 @@ -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,9 +29,9 @@ diff -urNpa mysql-8.4.3.orig/plugin/group_replication/libmysqlgcs/src/bindings/x
  }
  
  bool Gcs_message_stage_split_v2::update_members_information(
-diff -urNpa mysql-8.4.3.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h mysql-8.4.3/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h
---- mysql-8.4.3.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h       2024-12-04 01:34:56.146218627 +0100
-+++ mysql-8.4.3/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h    2024-12-04 01:38:54.885959476 +0100
+diff -urNpa mysql-8.4.4.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h mysql-8.4.4/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h
+--- mysql-8.4.4.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h       2025-02-20 23:09:06.451177377 +0100
++++ mysql-8.4.4/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h    2025-02-20 23:09:21.411364216 +0100
 @@ -26,10 +26,6 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
@@ -44,10 +44,10 @@ diff -urNpa mysql-8.4.3.orig/plugin/group_replication/libmysqlgcs/src/bindings/x
 +#include <xxhash.h>
  
  #endif  // GCS_XXHASH_H_INCLUDED
-diff -urNpa mysql-8.4.3.orig/sql/CMakeLists.txt mysql-8.4.3/sql/CMakeLists.txt
---- mysql-8.4.3.orig/sql/CMakeLists.txt        2024-12-04 01:35:02.086311702 +0100
-+++ mysql-8.4.3/sql/CMakeLists.txt     2024-12-04 01:40:44.595678425 +0100
-@@ -762,7 +762,6 @@ SET(SQL_SOURCE
+diff -urNpa mysql-8.4.4.orig/sql/CMakeLists.txt mysql-8.4.4/sql/CMakeLists.txt
+--- mysql-8.4.4.orig/sql/CMakeLists.txt        2025-02-20 23:09:06.635179676 +0100
++++ mysql-8.4.4/sql/CMakeLists.txt     2025-02-20 23:10:24.324149956 +0100
+@@ -768,7 +768,6 @@ SET(SQL_SOURCE
    ${CONF_SOURCES}
    ${SQL_SHARED_SOURCES}
    ${SQL_HEADERS}
@@ -55,7 +55,7 @@ diff -urNpa mysql-8.4.3.orig/sql/CMakeLists.txt mysql-8.4.3/sql/CMakeLists.txt
    ../libmysql/errmsg.cc
    ../sql-common/client.cc
    ../sql-common/client_plugin.cc
-@@ -828,11 +827,6 @@ IF(WIN32)
+@@ -834,19 +833,6 @@ IF(WIN32)
        )
  ENDIF()
  
@@ -64,13 +64,6 @@ diff -urNpa mysql-8.4.3.orig/sql/CMakeLists.txt mysql-8.4.3/sql/CMakeLists.txt
 -  COMPILE_DEFINITIONS XXH_NAMESPACE=MY_
 -  )
 -
- # Workaround for Apple Clang bug on ARM.
- # When linking mysqld (and executables using server_unittest_library)
- # we get linker warnings about
-@@ -857,14 +851,6 @@ IF(APPLE_ARM)
-     )
- ENDIF()
- 
 -ADD_COMPILE_FLAGS(
 -  ${BUNDLED_LZ4_PATH}/xxhash.c
 -  iterators/hash_join_iterator.cc
@@ -82,7 +75,7 @@ diff -urNpa mysql-8.4.3.orig/sql/CMakeLists.txt mysql-8.4.3/sql/CMakeLists.txt
  # Fixes "C1128: number of sections exceeded object file format limit" in MSVC
  IF(WIN32)
    ADD_COMPILE_FLAGS(
-@@ -962,7 +948,7 @@ TARGET_INCLUDE_DIRECTORIES(sql_main SYST
+@@ -943,7 +929,7 @@ TARGET_LINK_LIBRARIES(sql_main extra::un
  
  TARGET_LINK_LIBRARIES(sql_main ${MYSQLD_STATIC_PLUGIN_LIBS}
    mysql_server_component_services mysys strings vio
@@ -91,9 +84,9 @@ diff -urNpa mysql-8.4.3.orig/sql/CMakeLists.txt mysql-8.4.3/sql/CMakeLists.txt
    extra::rapidjson extra::boost)
  
  # sql/immutable_string.h uses
-diff -urNpa mysql-8.4.3.orig/sql/iterators/composite_iterators.cc mysql-8.4.3/sql/iterators/composite_iterators.cc
---- mysql-8.4.3.orig/sql/iterators/composite_iterators.cc      2024-12-04 01:35:02.630320226 +0100
-+++ mysql-8.4.3/sql/iterators/composite_iterators.cc   2024-12-04 01:38:54.889959539 +0100
+diff -urNpa mysql-8.4.4.orig/sql/iterators/composite_iterators.cc mysql-8.4.4/sql/iterators/composite_iterators.cc
+--- mysql-8.4.4.orig/sql/iterators/composite_iterators.cc      2025-02-20 23:09:06.747181074 +0100
++++ mysql-8.4.4/sql/iterators/composite_iterators.cc   2025-02-20 23:09:21.411364216 +0100
 @@ -44,7 +44,7 @@
  #include "my_dbug.h"
  #include "my_inttypes.h"
@@ -175,9 +168,9 @@ diff -urNpa mysql-8.4.3.orig/sql/iterators/composite_iterators.cc mysql-8.4.3/sq
            const size_t chunk_index = hash_to_chunk_index(chunk_hash);
            assert(chunk_index_to_set(chunk_index) == set_idx);
            assert(chunk_offset(chunk_index) == m_current_chunk_idx);
-diff -urNpa mysql-8.4.3.orig/sql/iterators/hash_join_iterator.cc mysql-8.4.3/sql/iterators/hash_join_iterator.cc
---- mysql-8.4.3.orig/sql/iterators/hash_join_iterator.cc       2024-12-04 01:35:02.646320477 +0100
-+++ mysql-8.4.3/sql/iterators/hash_join_iterator.cc    2024-12-04 01:38:54.889959539 +0100
+diff -urNpa mysql-8.4.4.orig/sql/iterators/hash_join_iterator.cc mysql-8.4.4/sql/iterators/hash_join_iterator.cc
+--- mysql-8.4.4.orig/sql/iterators/hash_join_iterator.cc       2025-02-20 23:09:06.747181074 +0100
++++ mysql-8.4.4/sql/iterators/hash_join_iterator.cc    2025-02-20 23:09:21.411364216 +0100
 @@ -38,7 +38,7 @@
  #include "my_dbug.h"
  #include "my_inttypes.h"
@@ -196,9 +189,9 @@ diff -urNpa mysql-8.4.3.orig/sql/iterators/hash_join_iterator.cc mysql-8.4.3/sql
                       join_key_and_row_buffer->length(), xxhash_seed);
  
    assert((chunks->size() & (chunks->size() - 1)) == 0);
-diff -urNpa mysql-8.4.3.orig/sql/rpl_write_set_handler.cc mysql-8.4.3/sql/rpl_write_set_handler.cc
---- mysql-8.4.3.orig/sql/rpl_write_set_handler.cc      2024-12-04 01:35:03.554334705 +0100
-+++ mysql-8.4.3/sql/rpl_write_set_handler.cc   2024-12-04 01:38:54.889959539 +0100
+diff -urNpa mysql-8.4.4.orig/sql/rpl_write_set_handler.cc mysql-8.4.4/sql/rpl_write_set_handler.cc
+--- mysql-8.4.4.orig/sql/rpl_write_set_handler.cc      2025-02-20 23:09:06.823182024 +0100
++++ mysql-8.4.4/sql/rpl_write_set_handler.cc   2025-02-20 23:09:21.411364216 +0100
 @@ -37,7 +37,7 @@
  #include "my_dbug.h"
  #include "my_inttypes.h"
@@ -217,9 +210,9 @@ diff -urNpa mysql-8.4.3.orig/sql/rpl_write_set_handler.cc mysql-8.4.3/sql/rpl_wr
    if (thd->get_transaction()->get_transaction_write_set_ctx()->add_write_set(
            hash))
      return true;
-diff -urNpa mysql-8.4.3.orig/unittest/gunit/hash_join-t.cc mysql-8.4.3/unittest/gunit/hash_join-t.cc
---- mysql-8.4.3.orig/unittest/gunit/hash_join-t.cc     2024-12-04 01:35:04.698352631 +0100
-+++ mysql-8.4.3/unittest/gunit/hash_join-t.cc  2024-12-04 01:38:54.889959539 +0100
+diff -urNpa mysql-8.4.4.orig/unittest/gunit/hash_join-t.cc mysql-8.4.4/unittest/gunit/hash_join-t.cc
+--- mysql-8.4.4.orig/unittest/gunit/hash_join-t.cc     2025-02-20 23:09:08.883207753 +0100
++++ mysql-8.4.4/unittest/gunit/hash_join-t.cc  2025-02-20 23:09:21.411364216 +0100
 @@ -38,7 +38,7 @@
  #include "my_config.h"
  #include "my_inttypes.h"
@@ -229,7 +222,7 @@ diff -urNpa mysql-8.4.3.orig/unittest/gunit/hash_join-t.cc mysql-8.4.3/unittest/
  #include "mysql/components/services/bits/psi_bits.h"
  #include "prealloced_array.h"
  #include "sql/field.h"
-@@ -227,7 +227,7 @@ static void BM_XXHash64ShortData(size_t
+@@ -228,7 +228,7 @@ static void BM_XXHash64ShortData(size_t
  
    size_t sum = 0;
    for (size_t i = 0; i < num_iterations; ++i) {
@@ -238,7 +231,7 @@ diff -urNpa mysql-8.4.3.orig/unittest/gunit/hash_join-t.cc mysql-8.4.3/unittest/
    }
    StopBenchmarkTiming();
  
-@@ -246,7 +246,7 @@ static void BM_XXHash64LongData(size_t n
+@@ -247,7 +247,7 @@ static void BM_XXHash64LongData(size_t n
  
    size_t sum = 0;
    for (size_t i = 0; i < num_iterations; ++i) {
@@ -247,9 +240,9 @@ diff -urNpa mysql-8.4.3.orig/unittest/gunit/hash_join-t.cc mysql-8.4.3/unittest/
    }
    StopBenchmarkTiming();
  
-diff -urNpa mysql-8.4.3.orig/unittest/gunit/innodb/ut0rnd-t.cc mysql-8.4.3/unittest/gunit/innodb/ut0rnd-t.cc
---- mysql-8.4.3.orig/unittest/gunit/innodb/ut0rnd-t.cc 2024-12-04 01:35:04.826354637 +0100
-+++ mysql-8.4.3/unittest/gunit/innodb/ut0rnd-t.cc      2024-12-04 01:38:54.889959539 +0100
+diff -urNpa mysql-8.4.4.orig/unittest/gunit/innodb/ut0rnd-t.cc mysql-8.4.4/unittest/gunit/innodb/ut0rnd-t.cc
+--- mysql-8.4.4.orig/unittest/gunit/innodb/ut0rnd-t.cc 2025-02-20 23:09:08.887207802 +0100
++++ mysql-8.4.4/unittest/gunit/innodb/ut0rnd-t.cc      2025-02-20 23:09:21.411364216 +0100
 @@ -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 9297725cd9ad6eb1180d295c528fb5d5d7f3d552..0f622e890dd6c37a4ab7851dec456633abb3f522 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -26,12 +26,12 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql-%{mysqlversion}
-Version:       8.4.3
+Version:       8.4.4
 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: 1a8a2a4cd3784579d06ed996dbbbbaee
+# Source0-md5: 8a84adf49a62da3147998928056d880b
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:       5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}
@@ -482,18 +482,18 @@ przekierowywania połączeń od klientów MySQL do serwerów MySQL.
 %prep
 %setup -q %{?with_sphinx:-a100} %{!?with_system_boost:-a101} -n mysql-%{version}
 
-%patch0 -p1
-%patch1 -p1
+%patch -P0 -p1
+%patch -P1 -p1
 
 %if %{with sphinx}
 # http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51
 %{__mv} sphinx-*/mysqlse storage/sphinx
-%patch17 -p1
-%patch18 -p1
+%patch -P17 -p1
+%patch -P18 -p1
 %endif
 
-%patch24 -p1
-%patch25 -p1
+%patch -P24 -p1
+%patch -P25 -p1
 
 # to get these files rebuild
 [ -f sql/sql_yacc.cc ] && %{__rm} sql/sql_yacc.cc

diff --git a/no_relative_paths.patch b/no_relative_paths.patch
index 74213d51676ef7ca96a4f43c31819a4fd0aa9714..623da5d6c32d9185b50ca033042e9703033ed418 100644 (file)
--- a/no_relative_paths.patch
+++ b/no_relative_paths.patch
@@ -1,6 +1,6 @@
-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
+diff -urNpa mysql-8.4.4.orig/sql/mysqld.cc mysql-8.4.4/sql/mysqld.cc
+--- mysql-8.4.4.orig/sql/mysqld.cc     2025-02-20 23:06:03.796896147 +0100
++++ mysql-8.4.4/sql/mysqld.cc  2025-02-20 23:06:39.241338828 +0100
 @@ -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);
@@ -36,7 +36,7 @@ diff -urNpa mysql-8.4.0.orig/sql/mysqld.cc mysql-8.4.0/sql/mysqld.cc
            sizeof(mysql_real_data_home) - 1);
  
    /* Must be initialized early for comparison of options name */
-@@ -12784,15 +12783,6 @@ static void set_server_version(void) {
+@@ -12797,15 +12796,6 @@ static void set_server_version(void) {
  #endif
  }
  
@@ -52,7 +52,7 @@ diff -urNpa mysql-8.4.0.orig/sql/mysqld.cc mysql-8.4.0/sql/mysqld.cc
  /**
    Test a file path to determine if the path is compatible with the secure file
    path restriction.
-@@ -13010,7 +13000,7 @@ static int fix_paths(void) {
+@@ -13023,7 +13013,7 @@ static int fix_paths(void) {
  
    convert_dirname(
        opt_plugin_dir,
@@ -61,7 +61,7 @@ diff -urNpa mysql-8.4.0.orig/sql/mysqld.cc mysql-8.4.0/sql/mysqld.cc
        NullS);
    (void)my_load_path(opt_plugin_dir, opt_plugin_dir, mysql_home);
    opt_plugin_dir_ptr = opt_plugin_dir;
-@@ -13021,7 +13011,7 @@ static int fix_paths(void) {
+@@ -13034,7 +13024,7 @@ static int fix_paths(void) {
        FN_LIBCHAR)
      --mysql_unpacked_real_data_home_len;