- updated to 8.0.40

diff --git a/mysql-system-xxhash.patch b/mysql-system-xxhash.patch
index 8cab7d233994a08585a078ef2b0452feab5c1e7a..d501c0f49f6eedb470da6c9938d7abb7b60f7a14 100644 (file)
--- a/mysql-system-xxhash.patch
+++ b/mysql-system-xxhash.patch
@@ -1,6 +1,6 @@
-diff -urNpa mysql-8.0.37.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt mysql-8.0.37/plugin/group_replication/libmysqlgcs/CMakeLists.txt
---- mysql-8.0.37.orig/plugin/group_replication/libmysqlgcs/CMakeLists.txt      2024-05-09 12:06:10.435063653 +0200
-+++ mysql-8.0.37/plugin/group_replication/libmysqlgcs/CMakeLists.txt   2024-05-09 12:06:48.667595584 +0200
+diff -urNp -x '*.orig' mysql-8.0.40.org/plugin/group_replication/libmysqlgcs/CMakeLists.txt mysql-8.0.40/plugin/group_replication/libmysqlgcs/CMakeLists.txt
+--- mysql-8.0.40.org/plugin/group_replication/libmysqlgcs/CMakeLists.txt       2024-09-18 12:08:24.000000000 +0200
++++ mysql-8.0.40/plugin/group_replication/libmysqlgcs/CMakeLists.txt   2024-12-04 01:22:22.354407342 +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.0.37.orig/plugin/group_replication/libmysqlgcs/CMakeLists.tx
  # 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.0.37.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc mysql-8.0.37/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc
---- mysql-8.0.37.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc        2024-05-09 12:06:10.435063653 +0200
-+++ mysql-8.0.37/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc     2024-05-09 12:06:48.667595584 +0200
+ IF(CMAKE_VERSION VERSION_GREATER "3.19" AND NOT APPLE_XCODE)
+   # New in version 3.19:
+diff -urNp -x '*.orig' mysql-8.0.40.org/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc mysql-8.0.40/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc
+--- mysql-8.0.40.org/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc 2024-09-18 12:08:24.000000000 +0200
++++ mysql-8.0.40/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc     2024-12-04 01:22:22.354407342 +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.0.37.orig/plugin/group_replication/libmysqlgcs/src/bindings/
  }
  
  bool Gcs_message_stage_split_v2::update_members_information(
-diff -urNpa mysql-8.0.37.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h mysql-8.0.37/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h
---- mysql-8.0.37.orig/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h      2024-05-09 12:06:10.439063709 +0200
-+++ mysql-8.0.37/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h   2024-05-09 12:06:48.667595584 +0200
+diff -urNp -x '*.orig' mysql-8.0.40.org/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h mysql-8.0.40/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h
+--- mysql-8.0.40.org/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h       2024-09-18 12:08:24.000000000 +0200
++++ mysql-8.0.40/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h   2024-12-04 01:22:22.354407342 +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.0.37.orig/plugin/group_replication/libmysqlgcs/src/bindings/
 +#include <xxhash.h>
  
  #endif  // GCS_XXHASH_H_INCLUDED
-diff -urNpa mysql-8.0.37.orig/sql/CMakeLists.txt mysql-8.0.37/sql/CMakeLists.txt
---- mysql-8.0.37.orig/sql/CMakeLists.txt       2024-05-09 12:06:08.783040668 +0200
-+++ mysql-8.0.37/sql/CMakeLists.txt    2024-05-09 12:08:19.128854193 +0200
+diff -urNp -x '*.orig' mysql-8.0.40.org/sql/CMakeLists.txt mysql-8.0.40/sql/CMakeLists.txt
+--- mysql-8.0.40.org/sql/CMakeLists.txt        2024-09-18 12:08:24.000000000 +0200
++++ mysql-8.0.40/sql/CMakeLists.txt    2024-12-04 01:22:22.354407342 +0100
 @@ -762,7 +762,6 @@ SET(SQL_SOURCE
    ${CONF_SOURCES}
    ${SQL_SHARED_SOURCES}
@@ -90,9 +90,9 @@ diff -urNpa mysql-8.0.37.orig/sql/CMakeLists.txt mysql-8.0.37/sql/CMakeLists.txt
    extra::rapidjson)
  
  # sql/immutable_string.h uses
-diff -urNpa mysql-8.0.37.orig/sql/iterators/hash_join_iterator.cc mysql-8.0.37/sql/iterators/hash_join_iterator.cc
---- mysql-8.0.37.orig/sql/iterators/hash_join_iterator.cc      2024-05-09 12:06:08.847041559 +0200
-+++ mysql-8.0.37/sql/iterators/hash_join_iterator.cc   2024-05-09 12:09:27.329803079 +0200
+diff -urNp -x '*.orig' mysql-8.0.40.org/sql/iterators/hash_join_iterator.cc mysql-8.0.40/sql/iterators/hash_join_iterator.cc
+--- mysql-8.0.40.org/sql/iterators/hash_join_iterator.cc       2024-09-18 12:08:24.000000000 +0200
++++ mysql-8.0.40/sql/iterators/hash_join_iterator.cc   2024-12-04 01:22:22.354407342 +0100
 @@ -37,7 +37,7 @@
  #include "my_bit.h"
  #include "my_inttypes.h"
@@ -111,9 +111,9 @@ diff -urNpa mysql-8.0.37.orig/sql/iterators/hash_join_iterator.cc mysql-8.0.37/s
                       join_key_and_row_buffer->length(), xxhash_seed);
  
    assert((chunks->size() & (chunks->size() - 1)) == 0);
-diff -urNpa mysql-8.0.37.orig/sql/rpl_write_set_handler.cc mysql-8.0.37/sql/rpl_write_set_handler.cc
---- mysql-8.0.37.orig/sql/rpl_write_set_handler.cc     2024-05-09 12:06:08.823041225 +0200
-+++ mysql-8.0.37/sql/rpl_write_set_handler.cc  2024-05-09 12:06:48.667595584 +0200
+diff -urNp -x '*.orig' mysql-8.0.40.org/sql/rpl_write_set_handler.cc mysql-8.0.40/sql/rpl_write_set_handler.cc
+--- mysql-8.0.40.org/sql/rpl_write_set_handler.cc      2024-09-18 12:08:24.000000000 +0200
++++ mysql-8.0.40/sql/rpl_write_set_handler.cc  2024-12-04 01:22:22.354407342 +0100
 @@ -38,7 +38,7 @@
  #include "my_dbug.h"
  #include "my_inttypes.h"
@@ -132,9 +132,9 @@ diff -urNpa mysql-8.0.37.orig/sql/rpl_write_set_handler.cc mysql-8.0.37/sql/rpl_
  }
  
  #ifndef NDEBUG
-diff -urNpa mysql-8.0.37.orig/unittest/gunit/hash_join-t.cc mysql-8.0.37/unittest/gunit/hash_join-t.cc
---- mysql-8.0.37.orig/unittest/gunit/hash_join-t.cc    2024-05-09 12:06:10.551065267 +0200
-+++ mysql-8.0.37/unittest/gunit/hash_join-t.cc 2024-05-09 12:06:48.667595584 +0200
+diff -urNp -x '*.orig' mysql-8.0.40.org/unittest/gunit/hash_join-t.cc mysql-8.0.40/unittest/gunit/hash_join-t.cc
+--- mysql-8.0.40.org/unittest/gunit/hash_join-t.cc     2024-09-18 12:08:24.000000000 +0200
++++ mysql-8.0.40/unittest/gunit/hash_join-t.cc 2024-12-04 01:22:22.354407342 +0100
 @@ -38,7 +38,7 @@
  #include "my_config.h"
  #include "my_inttypes.h"
@@ -162,9 +162,9 @@ diff -urNpa mysql-8.0.37.orig/unittest/gunit/hash_join-t.cc mysql-8.0.37/unittes
    }
    StopBenchmarkTiming();
  
-diff -urNpa mysql-8.0.37.orig/unittest/gunit/innodb/ut0rnd-t.cc mysql-8.0.37/unittest/gunit/innodb/ut0rnd-t.cc
---- mysql-8.0.37.orig/unittest/gunit/innodb/ut0rnd-t.cc        2024-05-09 12:06:10.551065267 +0200
-+++ mysql-8.0.37/unittest/gunit/innodb/ut0rnd-t.cc     2024-05-09 12:06:48.667595584 +0200
+diff -urNp -x '*.orig' mysql-8.0.40.org/unittest/gunit/innodb/ut0rnd-t.cc mysql-8.0.40/unittest/gunit/innodb/ut0rnd-t.cc
+--- mysql-8.0.40.org/unittest/gunit/innodb/ut0rnd-t.cc 2024-09-18 12:08:24.000000000 +0200
++++ mysql-8.0.40/unittest/gunit/innodb/ut0rnd-t.cc     2024-12-04 01:22:22.354407342 +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 d4815ad206939948f360683d01540d07589b4a67..a2706207c5ddcf1fba012066f33c430e5eb20490 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.0.39
+Version:       8.0.40
 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: 9dc05754e91ac7e5b0e20276ab11193e
+# Source0-md5: b3d50030a4e872fb7ab1b6043b58b335
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:       5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}