- drop xxhash patch, seems to be handled upstream

diff --git a/mysql-system-xxhash.patch b/mysql-system-xxhash.patch
deleted file mode 100644 (file)
index 9a3ec9c..0000000
--- a/mysql-system-xxhash.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff -urNpa mysql-8.0.41.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt mysql-8.0.41/plugin/group_replication/libmysqlgcs/CMakeLists.txt
---- mysql-8.0.41.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt      2025-02-20 23:26:38.512305873 +0100
-+++ mysql-8.0.41/plugin/group_replication/libmysqlgcs/CMakeLists.txt   2025-02-20 23:27:39.717067948 +0100
-@@ -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
--  ${BUNDLED_LZ4_PATH}/xxhash.c # required by gcs_message_stage_split
-   src/bindings/xcom/gcs_message_stage_split.cc
-   src/bindings/xcom/gcs_xcom_synode.cc
-   src/bindings/xcom/gcs_xcom_expels_in_progress.cc)
-@@ -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)
-+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.0.41.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc mysql-8.0.41/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc
---- mysql-8.0.41.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc        2025-02-20 23:26:38.516305922 +0100
-+++ mysql-8.0.41/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc     2025-02-20 23:27:39.721067998 +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);
- 
--  return GCS_XXH64(info.c_str(), info.size(), 0);
-+  return XXH64(info.c_str(), info.size(), 0);
- }
- 
- bool Gcs_message_stage_split_v2::update_members_information(
-diff -urNpa mysql-8.0.41.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h mysql-8.0.41/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h
---- mysql-8.0.41.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h      2025-02-20 23:26:38.516305922 +0100
-+++ mysql-8.0.41/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h   2025-02-20 23:27:39.721067998 +0100
-@@ -26,10 +26,6 @@
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
- */
- 
--// Define a namespace prefix to all xxhash functions. This is done to
--// avoid conflict with xxhash symbols in liblz4.
--#define XXH_NAMESPACE GCS_
--
--#include "xxhash.h"
-+#include <xxhash.h>
- 
- #endif  // GCS_XXHASH_H_INCLUDED
-diff -urNpa mysql-8.0.41.orig/sql/CMakeLists.txt mysql-8.0.41/sql/CMakeLists.txt
---- mysql-8.0.41.orig/sql/CMakeLists.txt       2025-02-20 23:26:38.648307566 +0100
-+++ mysql-8.0.41/sql/CMakeLists.txt    2025-02-20 23:27:39.721067998 +0100
-@@ -762,7 +762,6 @@ SET(SQL_SOURCE
-   ${CONF_SOURCES}
-   ${SQL_SHARED_SOURCES}
-   ${SQL_HEADERS}
--  ${BUNDLED_LZ4_PATH}/xxhash.c
-   ../libmysql/errmsg.cc
-   ../sql-common/client.cc
-   ../sql-common/client_plugin.cc
-@@ -818,11 +817,6 @@ IF(WIN32)
-       )
- ENDIF()
- 
--MY_ADD_COMPILE_DEFINITIONS(
--  ${BUNDLED_LZ4_PATH}/xxhash.c
--  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
-@@ -848,13 +842,6 @@ IF(APPLE_ARM)
- ENDIF()
- 
- 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}
--  )
--
--ADD_COMPILE_FLAGS(
-   iterators/hash_join_buffer.cc
-   COMPILE_FLAGS
-   -I${CMAKE_SOURCE_DIR}/extra/unordered_dense/unordered_dense-4.4.0/include
-@@ -949,7 +936,7 @@ TARGET_LINK_LIBRARIES(sql_main extra::un
- 
- TARGET_LINK_LIBRARIES(sql_main ${MYSQLD_STATIC_PLUGIN_LIBS}
-   mysql_server_component_services mysys strings vio
--  binlogevents_static ${LIBWRAP} ${LIBDL} ${SSL_LIBRARIES}
-+  binlogevents_static xxhash ${LIBWRAP} ${LIBDL} ${SSL_LIBRARIES}
-   extra::rapidjson)
- 
- # sql/immutable_string.h uses
-diff -urNpa mysql-8.0.41.orig/sql/iterators/hash_join_iterator.cc mysql-8.0.41/sql/iterators/hash_join_iterator.cc
---- mysql-8.0.41.orig/sql/iterators/hash_join_iterator.cc      2025-02-20 23:26:38.684308014 +0100
-+++ mysql-8.0.41/sql/iterators/hash_join_iterator.cc   2025-02-20 23:27:39.721067998 +0100
-@@ -37,7 +37,7 @@
- #include "my_bit.h"
- #include "my_inttypes.h"
- #include "my_sys.h"
--#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
--          : MY_XXH64(join_key_and_row_buffer->ptr(),
-+          : XXH64(join_key_and_row_buffer->ptr(),
-                      join_key_and_row_buffer->length(), xxhash_seed);
- 
-   assert((chunks->size() & (chunks->size() - 1)) == 0);
-diff -urNpa mysql-8.0.41.orig/sql/rpl_write_set_handler.cc mysql-8.0.41/sql/rpl_write_set_handler.cc
---- mysql-8.0.41.orig/sql/rpl_write_set_handler.cc     2025-02-20 23:26:38.704308263 +0100
-+++ mysql-8.0.41/sql/rpl_write_set_handler.cc  2025-02-20 23:27:39.721067998 +0100
-@@ -38,7 +38,7 @@
- #include "my_dbug.h"
- #include "my_inttypes.h"
- #include "my_murmur3.h"  // murmur3_32
--#include "my_xxhash.h"   // IWYU pragma: keep
-+#include <xxhash.h>
- #include "mysql_com.h"
- #include "sql-common/json_binary.h"
- #include "sql-common/json_dom.h"
-@@ -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
--    return (MY_XXH64((const uchar *)T, len, 0));
-+    return (XXH64((const uchar *)T, len, 0));
- }
- 
- #ifndef NDEBUG
-diff -urNpa mysql-8.0.41.orig/unittest/gunit/hash_join-t.cc mysql-8.0.41/unittest/gunit/hash_join-t.cc
---- mysql-8.0.41.orig/unittest/gunit/hash_join-t.cc    2025-02-20 23:26:39.140313692 +0100
-+++ mysql-8.0.41/unittest/gunit/hash_join-t.cc 2025-02-20 23:27:39.721067998 +0100
-@@ -38,7 +38,7 @@
- #include "my_config.h"
- #include "my_inttypes.h"
- #include "my_murmur3.h"
--#include "my_xxhash.h"
-+#include <xxhash.h>
- #include "mysql/components/services/bits/psi_bits.h"
- #include "prealloced_array.h"
- #include "sql/field.h"
-@@ -228,7 +228,7 @@ static void BM_XXHash64ShortData(size_t
- 
-   size_t sum = 0;
-   for (size_t i = 0; i < num_iterations; ++i) {
--    sum += MY_XXH64(&data[0], data.size(), 0);
-+    sum += XXH64(&data[0], data.size(), 0);
-   }
-   StopBenchmarkTiming();
- 
-@@ -247,7 +247,7 @@ static void BM_XXHash64LongData(size_t n
- 
-   size_t sum = 0;
-   for (size_t i = 0; i < num_iterations; ++i) {
--    sum += MY_XXH64(&data[0], data.size(), 0);
-+    sum += XXH64(&data[0], data.size(), 0);
-   }
-   StopBenchmarkTiming();
- 
-diff -urNpa mysql-8.0.41.orig/unittest/gunit/innodb/ut0rnd-t.cc mysql-8.0.41/unittest/gunit/innodb/ut0rnd-t.cc
---- mysql-8.0.41.orig/unittest/gunit/innodb/ut0rnd-t.cc        2025-02-20 23:26:39.152313842 +0100
-+++ mysql-8.0.41/unittest/gunit/innodb/ut0rnd-t.cc     2025-02-20 23:27:39.721067998 +0100
-@@ -34,7 +34,7 @@
- #include "storage/innobase/include/ut0crc32.h"
- #include "storage/innobase/include/ut0rnd.h"
- 
--#include "my_xxhash.h"
-+#include <xxhash.h>
- 
- namespace innodb_ut0rnd_unittest {
- 

diff --git a/mysql.spec b/mysql.spec
index 56989d1cec9549d08abb1da646eeecf18b32c288..a128aa1f558a0e9ccbbb6455a8af361dc00d2ed3 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -52,7 +52,6 @@ Source12:     mysql-ndb-cpc.sysconfig
 Source13:      mysql-client.conf
 Source14:      my.cnf
 Patch0:                no_relative_paths.patch
-Patch1:                mysql-system-xxhash.patch
 
 Patch17:       mysql-5.7-sphinx.patch
 Patch18:       mysql-sphinx.patch
@@ -481,7 +480,6 @@ przekierowywania połączeń od klientów MySQL do serwerów MySQL.
 %setup -q %{?with_sphinx:-a100} %{!?with_system_boost:-a101} -n mysql-%{version}
 
 %patch -P0 -p1
-%patch -P1 -p1
 
 %if %{with sphinx}
 # http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51