- updated to 8.4.3

diff --git a/mysql-system-xxhash.patch b/mysql-system-xxhash.patch
index 62c1cc64f436fcc4f1069a04f877c244e466ef15..4002f03b9bf34fbda940d2f51d6db7b551be552c 100644 (file)
--- a/mysql-system-xxhash.patch
+++ b/mysql-system-xxhash.patch
@@ -1,6 +1,6 @@
-diff -urNpa mysql-8.4.0.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt mysql-8.4.0/plugin/group_replication/libmysqlgcs/CMakeLists.txt
---- mysql-8.4.0.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt       2024-05-09 18:15:12.545961950 +0200
-+++ mysql-8.4.0/plugin/group_replication/libmysqlgcs/CMakeLists.txt    2024-05-09 18:15:56.994571858 +0200
+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
 @@ -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.0.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt
  # TARGET_LINK_LIBRARIES(mysqlgcs mysys)
 +TARGET_LINK_LIBRARIES(mysqlgcs xxhash)
  
- IF(LINUX AND WITH_TIRPC STREQUAL "bundled")
-   ADD_DEPENDENCIES(mysqlgcs tirpc_ext)
-diff -urNpa mysql-8.4.0.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc mysql-8.4.0/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc
---- mysql-8.4.0.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc 2024-05-09 18:15:12.549962005 +0200
-+++ mysql-8.4.0/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc      2024-05-09 18:15:57.910584352 +0200
+ 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
 @@ -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.0.orig/plugin/group_replication/libmysqlgcs/src/bindings/x
  }
  
  bool Gcs_message_stage_split_v2::update_members_information(
-diff -urNpa mysql-8.4.0.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h mysql-8.4.0/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h
---- mysql-8.4.0.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h       2024-05-09 18:15:12.549962005 +0200
-+++ mysql-8.4.0/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h    2024-05-09 18:15:57.910584352 +0200
+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
 @@ -26,10 +26,6 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
@@ -44,9 +44,9 @@ diff -urNpa mysql-8.4.0.orig/plugin/group_replication/libmysqlgcs/src/bindings/x
 +#include <xxhash.h>
  
  #endif  // GCS_XXHASH_H_INCLUDED
-diff -urNpa mysql-8.4.0.orig/sql/CMakeLists.txt mysql-8.4.0/sql/CMakeLists.txt
---- mysql-8.4.0.orig/sql/CMakeLists.txt        2024-05-09 18:15:03.917843242 +0200
-+++ mysql-8.4.0/sql/CMakeLists.txt     2024-05-09 18:16:12.978789893 +0200
+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
    ${CONF_SOURCES}
    ${SQL_SHARED_SOURCES}
@@ -67,10 +67,11 @@ diff -urNpa mysql-8.4.0.orig/sql/CMakeLists.txt mysql-8.4.0/sql/CMakeLists.txt
  # Workaround for Apple Clang bug on ARM.
  # When linking mysqld (and executables using server_unittest_library)
  # we get linker warnings about
-@@ -858,14 +852,6 @@ IF(APPLE_ARM)
+@@ -857,14 +851,6 @@ IF(APPLE_ARM)
+     )
  ENDIF()
  
- ADD_COMPILE_FLAGS(
+-ADD_COMPILE_FLAGS(
 -  ${BUNDLED_LZ4_PATH}/xxhash.c
 -  iterators/hash_join_iterator.cc
 -  iterators/composite_iterators.cc
@@ -78,11 +79,10 @@ diff -urNpa mysql-8.4.0.orig/sql/CMakeLists.txt mysql-8.4.0/sql/CMakeLists.txt
 -  COMPILE_FLAGS -I${CMAKE_SOURCE_DIR}/extra/lz4 -I${BUNDLED_LZ4_PATH}
 -  )
 -
--ADD_COMPILE_FLAGS(
-   iterators/composite_iterators.cc
-   iterators/hash_join_buffer.cc
-   COMPILE_FLAGS
-@@ -966,7 +952,7 @@ MYSQL_ADD_PLUGIN(mysql_native_password
+ # 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
  
  TARGET_LINK_LIBRARIES(sql_main ${MYSQLD_STATIC_PLUGIN_LIBS}
    mysql_server_component_services mysys strings vio
@@ -91,9 +91,9 @@ diff -urNpa mysql-8.4.0.orig/sql/CMakeLists.txt mysql-8.4.0/sql/CMakeLists.txt
    extra::rapidjson extra::boost)
  
  # sql/immutable_string.h uses
-diff -urNpa mysql-8.4.0.orig/sql/iterators/composite_iterators.cc mysql-8.4.0/sql/iterators/composite_iterators.cc
---- mysql-8.4.0.orig/sql/iterators/composite_iterators.cc      2024-05-09 18:15:03.989844233 +0200
-+++ mysql-8.4.0/sql/iterators/composite_iterators.cc   2024-05-09 18:15:57.910584352 +0200
+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
 @@ -44,7 +44,7 @@
  #include "my_dbug.h"
  #include "my_inttypes.h"
@@ -103,7 +103,7 @@ diff -urNpa mysql-8.4.0.orig/sql/iterators/composite_iterators.cc mysql-8.4.0/sq
  #include "mysql_com.h"
  #include "mysqld_error.h"
  #include "prealloced_array.h"
-@@ -2928,7 +2928,7 @@ bool SpillState::compute_chunk_file_sets
+@@ -2932,7 +2932,7 @@ bool SpillState::compute_chunk_file_sets
    const ulonglong primary_hash =
        static_cast<ulonglong>(m_materialized_table->hash_field->val_int());
    const uint64_t chunk_hash =
@@ -112,7 +112,7 @@ diff -urNpa mysql-8.4.0.orig/sql/iterators/composite_iterators.cc mysql-8.4.0/sq
  
    const size_t chunk_index = hash_to_chunk_index(chunk_hash);
    m_offending_row.m_chunk_offset = chunk_offset(chunk_index);
-@@ -3005,7 +3005,7 @@ bool SpillState::spread_hash_map_to_HF_c
+@@ -3009,7 +3009,7 @@ bool SpillState::spread_hash_map_to_HF_c
          const ulonglong primary_hash =
              static_cast<ulonglong>(m_materialized_table->hash_field->val_int());
          const uint64_t chunk_hash =
@@ -121,7 +121,7 @@ diff -urNpa mysql-8.4.0.orig/sql/iterators/composite_iterators.cc mysql-8.4.0/sq
          const size_t chunk_index = hash_to_chunk_index(chunk_hash);
          const size_t set_index = chunk_index_to_set(chunk_index);
          const size_t offset = chunk_offset(chunk_index);
-@@ -3070,7 +3070,7 @@ bool SpillState::append_hash_map_to_HF()
+@@ -3074,7 +3074,7 @@ bool SpillState::append_hash_map_to_HF()
        const ulonglong primary_hash =
            static_cast<ulonglong>(m_materialized_table->hash_field->val_int());
        const uint64_t chunk_hash =
@@ -130,7 +130,7 @@ diff -urNpa mysql-8.4.0.orig/sql/iterators/composite_iterators.cc mysql-8.4.0/sq
        const size_t chunk_index = hash_to_chunk_index(chunk_hash);
        const size_t set_index = chunk_index_to_set(chunk_index);
        const size_t offset = chunk_offset(chunk_index);
-@@ -3164,7 +3164,7 @@ bool SpillState::save_operand_to_IF_chun
+@@ -3168,7 +3168,7 @@ bool SpillState::save_operand_to_IF_chun
        m_materialized_table->hash_field->store(
            static_cast<longlong>(primary_hash), true);
        const uint64_t chunk_hash =
@@ -139,7 +139,7 @@ diff -urNpa mysql-8.4.0.orig/sql/iterators/composite_iterators.cc mysql-8.4.0/sq
        const size_t chunk_index = hash_to_chunk_index(chunk_hash);
        const size_t set_index = chunk_index_to_set(chunk_index);
        const size_t offset = chunk_offset(chunk_index);
-@@ -3219,7 +3219,7 @@ bool SpillState::write_HF(THD *thd, size
+@@ -3223,7 +3223,7 @@ bool SpillState::write_HF(THD *thd, size
      const ulonglong primary_hash =
          static_cast<ulonglong>(m_materialized_table->hash_field->val_int());
      const uint64_t chunk_hash =
@@ -148,7 +148,7 @@ diff -urNpa mysql-8.4.0.orig/sql/iterators/composite_iterators.cc mysql-8.4.0/sq
      const size_t chunk_index = hash_to_chunk_index(chunk_hash);
      const size_t set_index = chunk_index_to_set(chunk_index);
      assert(chunk_offset(chunk_index) == chunk_idx);
-@@ -3452,7 +3452,7 @@ int SpillState::read_next_row(const Oper
+@@ -3456,7 +3456,7 @@ int SpillState::read_next_row(const Oper
              const ulonglong primary_hash = static_cast<ulonglong>(
                  m_materialized_table->hash_field->val_int());
              const uint64_t chunk_hash =
@@ -157,7 +157,7 @@ diff -urNpa mysql-8.4.0.orig/sql/iterators/composite_iterators.cc mysql-8.4.0/sq
              const size_t chunk_index = hash_to_chunk_index(chunk_hash);
              const size_t set_index = chunk_index_to_set(chunk_index);
              assert(chunk_offset(chunk_index) == m_current_chunk_idx);
-@@ -3485,7 +3485,7 @@ int SpillState::read_next_row(const Oper
+@@ -3489,7 +3489,7 @@ int SpillState::read_next_row(const Oper
              const ulonglong primary_hash = static_cast<ulonglong>(
                  m_materialized_table->hash_field->val_int());
              const uint64_t chunk_hash =
@@ -166,7 +166,7 @@ diff -urNpa mysql-8.4.0.orig/sql/iterators/composite_iterators.cc mysql-8.4.0/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);
-@@ -3574,7 +3574,7 @@ int SpillState::read_next_row_secondary_
+@@ -3578,7 +3578,7 @@ int SpillState::read_next_row_secondary_
            const ulonglong primary_hash = static_cast<ulonglong>(
                m_materialized_table->hash_field->val_int());
            const uint64_t chunk_hash =
@@ -175,9 +175,9 @@ diff -urNpa mysql-8.4.0.orig/sql/iterators/composite_iterators.cc mysql-8.4.0/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.0.orig/sql/iterators/hash_join_iterator.cc mysql-8.4.0/sql/iterators/hash_join_iterator.cc
---- mysql-8.4.0.orig/sql/iterators/hash_join_iterator.cc       2024-05-09 18:15:03.989844233 +0200
-+++ mysql-8.4.0/sql/iterators/hash_join_iterator.cc    2024-05-09 18:15:57.910584352 +0200
+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
 @@ -38,7 +38,7 @@
  #include "my_dbug.h"
  #include "my_inttypes.h"
@@ -196,9 +196,9 @@ diff -urNpa mysql-8.4.0.orig/sql/iterators/hash_join_iterator.cc mysql-8.4.0/sql
                       join_key_and_row_buffer->length(), xxhash_seed);
  
    assert((chunks->size() & (chunks->size() - 1)) == 0);
-diff -urNpa mysql-8.4.0.orig/sql/rpl_write_set_handler.cc mysql-8.4.0/sql/rpl_write_set_handler.cc
---- mysql-8.4.0.orig/sql/rpl_write_set_handler.cc      2024-05-09 18:15:03.945843627 +0200
-+++ mysql-8.4.0/sql/rpl_write_set_handler.cc   2024-05-09 18:15:57.910584352 +0200
+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
 @@ -37,7 +37,7 @@
  #include "my_dbug.h"
  #include "my_inttypes.h"
@@ -217,9 +217,9 @@ diff -urNpa mysql-8.4.0.orig/sql/rpl_write_set_handler.cc mysql-8.4.0/sql/rpl_wr
    if (thd->get_transaction()->get_transaction_write_set_ctx()->add_write_set(
            hash))
      return true;
-diff -urNpa mysql-8.4.0.orig/unittest/gunit/hash_join-t.cc mysql-8.4.0/unittest/gunit/hash_join-t.cc
---- mysql-8.4.0.orig/unittest/gunit/hash_join-t.cc     2024-05-09 18:15:15.950008783 +0200
-+++ mysql-8.4.0/unittest/gunit/hash_join-t.cc  2024-05-09 18:15:57.910584352 +0200
+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
 @@ -38,7 +38,7 @@
  #include "my_config.h"
  #include "my_inttypes.h"
@@ -247,9 +247,9 @@ diff -urNpa mysql-8.4.0.orig/unittest/gunit/hash_join-t.cc mysql-8.4.0/unittest/
    }
    StopBenchmarkTiming();
  
-diff -urNpa mysql-8.4.0.orig/unittest/gunit/innodb/ut0rnd-t.cc mysql-8.4.0/unittest/gunit/innodb/ut0rnd-t.cc
---- mysql-8.4.0.orig/unittest/gunit/innodb/ut0rnd-t.cc 2024-05-09 18:15:15.998009443 +0200
-+++ mysql-8.4.0/unittest/gunit/innodb/ut0rnd-t.cc      2024-05-09 18:15:57.910584352 +0200
+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
 @@ -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 07d25fe490d378e6d698c5d0351350d1e36adbca..9297725cd9ad6eb1180d295c528fb5d5d7f3d552 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.2
+Version:       8.4.3
 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: a632063fdb1c7de2c5db47e1f66191cd
+# Source0-md5: 1a8a2a4cd3784579d06ed996dbbbbaee
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:       5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}