PS-9500: Code refresh for 8.0.41-32 (conflicts solved)

Author: inikep

MYSQL_VERSION

@@ -1,13 +1,5 @@
 MYSQL_VERSION_MAJOR=8
 MYSQL_VERSION_MINOR=0
-<<<<<<< HEAD
-MYSQL_VERSION_PATCH=40
-MYSQL_VERSION_EXTRA=-31
-||||||| 89e1c722476d
-MYSQL_VERSION_PATCH=40
-MYSQL_VERSION_EXTRA=
-=======
 MYSQL_VERSION_PATCH=41
-MYSQL_VERSION_EXTRA=
->>>>>>> mysql-8.0.41
+MYSQL_VERSION_EXTRA=-32
 MYSQL_VERSION_STABILITY="LTS"

client/CMakeLists.txt

@@ -75,19 +75,15 @@ MYSQL_ADD_EXECUTABLE(mysqltest
   ENABLE_EXPORTS
   LINK_LIBRARIES perconaserverclient
   )
-<<<<<<< HEAD
+
 IF (WITH_COREDUMPER)
   TARGET_LINK_LIBRARIES(mysqltest coredumper)
 ENDIF()
 
-||||||| 89e1c722476d
-=======
-
 IF(MY_COMPILER_IS_GNU AND (WITH_LTO OR CMAKE_COMPILER_FLAG_WITH_LTO))
   TARGET_LINK_OPTIONS(mysqltest PRIVATE -Wno-error=stringop-overflow)
 ENDIF()
 
->>>>>>> mysql-8.0.41
 MYSQL_ADD_EXECUTABLE(mysqlcheck
   check/mysqlcheck.cc
   check/mysqlcheck_core.cc

man/mysqldumpslow.1

@@ -2,24 +2,12 @@
 .\"     Title: mysqldumpslow
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-<<<<<<< HEAD
-.\"      Date: 08/31/2023
-||||||| 89e1c722476d
-.\"      Date: 09/17/2024
-=======
 .\"      Date: 12/13/2024
->>>>>>> mysql-8.0.41
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-<<<<<<< HEAD
-.TH "MYSQLDUMPSLOW" "1" "08/31/2023" "MySQL 8\&.0" "MySQL Database System"
-||||||| 89e1c722476d
-.TH "MYSQLDUMPSLOW" "1" "09/17/2024" "MySQL 8\&.0" "MySQL Database System"
-=======
 .TH "MYSQLDUMPSLOW" "1" "12/13/2024" "MySQL 8\&.0" "MySQL Database System"
->>>>>>> mysql-8.0.41
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

mysql-test/r/mysql_config_editor.result

@@ -100,14 +100,8 @@ user = "test_user4"
 ##############################################
 # Tests for mysql_config_editor's help command
 ##############################################
-<<<<<<< HEAD
-Copyright (c) 2009-2024 Percona LLC and/or its affiliates
-Copyright (c) 2012, 2024, Oracle and/or its affiliates.
-||||||| 89e1c722476d
-Copyright (c) 2012, 2024, Oracle and/or its affiliates.
-=======
+Copyright (c) 2009-2025 Percona LLC and/or its affiliates
 Copyright (c) 2012, 2025, Oracle and/or its affiliates.
->>>>>>> mysql-8.0.41
 
 Oracle is a registered trademark of Oracle Corporation and/or its
 affiliates. Other names may be trademarks of their respective

mysys/CMakeLists.txt

@@ -185,20 +185,16 @@ IF(FREEBSD)
   ADD_COMPILE_FLAGS(stacktrace.cc COMPILE_FLAGS ${LIBUNWIND_CFLAGS})
 ENDIF()
 
-<<<<<<< HEAD
-IF (WITH_COREDUMPER)
-  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extra/coredumper/include)
-ENDIF()
-
-||||||| 89e1c722476d
-=======
 IF(WITH_EXT_BACKTRACE)
   SET(BACKTRACE_LIBRARIES ext::backtrace)
 ELSE()
   UNSET(BACKTRACE_LIBRARIES)
 ENDIF()
 
->>>>>>> mysql-8.0.41
+IF (WITH_COREDUMPER)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extra/coredumper/include)
+ENDIF()
+
 ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES}
   LINK_LIBRARIES
   mytime

plugin/group_replication/src/certifier.cc

@@ -1302,17 +1302,6 @@ void Certifier::garbage_collect() {
   ulonglong starttime = my_micro_time();
 
   Certification_info::iterator it = certification_info.begin();
-<<<<<<< HEAD
-
-  /*
-    The goal of the following loop is to avoid locking for too long transactions
-    on servers that have a high rate of trx. Processing 1M GTIDs in the original
-    code blocked the transaction processing for about 1s.
-  */
-||||||| 89e1c722476d
-  stable_gtid_set_lock->wrlock();
-=======
-  stable_gtid_set_lock->wrlock();
 
   uint64 garbage_collector_counter = garbage_collect_runs;
 
@@ -1321,10 +1310,14 @@ void Certifier::garbage_collect() {
     garbage_collector_counter = 0;
   });
 
->>>>>>> mysql-8.0.41
+  /*
+    The goal of the following loop is to avoid locking for too long transactions
+    on servers that have a high rate of trx. Processing 1M GTIDs in the original
+    code blocked the transaction processing for about 1s.
+  */
   while (it != certification_info.end()) {
-<<<<<<< HEAD
     stable_gtid_set_lock->wrlock();
+    uint64 write_set_counter = it->second->get_garbage_collect_counter();
 
     /* Needs to increase the rate if it takes too long, add a chunk every 5s */
     ulonglong rate_multiplier = (my_micro_time() - starttime) / 5000000 + 1;
@@ -1337,39 +1330,16 @@ void Certifier::garbage_collect() {
     for (ulong i = 0; i < chunk_size; ++i) {
       if (it == certification_info.end()) {
         break;
-||||||| 89e1c722476d
-    if (it->second->is_subset_not_equals(stable_gtid_set)) {
-      if (it->second->unlink() == 0) {
-        /*
-          Claim Gtid_set_ref used memory to
-          `thread/group_rpl/THD_certifier_broadcast` thread, since this is
-          thread that does release the memory.
-        */
-        it->second->claim_memory_ownership(true);
-        delete it->second;
-=======
-    uint64 write_set_counter = it->second->get_garbage_collect_counter();
-
-    /*
-       we need to clear gtid_set_ref if marked with UINT64_MAX or
-       subset_not_equals of stable_gtid_set
-    */
-    if (write_set_counter == UINT64_MAX ||
-        (write_set_counter < garbage_collector_counter &&
-         it->second->is_subset_not_equals(stable_gtid_set))) {
-      it->second->set_garbage_collect_counter(UINT64_MAX);
-      if (it->second->unlink() == 0) {
-        /*
-          Claim Gtid_set_ref used memory to
-          `thread/group_rpl/THD_certifier_broadcast` thread, since this is
-          thread that does release the memory.
-        */
-        it->second->claim_memory_ownership(true);
-        delete it->second;
->>>>>>> mysql-8.0.41
       }
-<<<<<<< HEAD
-      if (it->second->is_subset_not_equals(stable_gtid_set)) {
+
+      /*
+        we need to clear gtid_set_ref if marked with UINT64_MAX or
+        subset_not_equals of stable_gtid_set
+      */
+      if (write_set_counter == UINT64_MAX ||
+          (write_set_counter < garbage_collector_counter &&
+           it->second->is_subset_not_equals(stable_gtid_set))) {
+        it->second->set_garbage_collect_counter(UINT64_MAX);
         if (it->second->unlink() == 0) {
           /*
             Claim Gtid_set_ref used memory to
@@ -1381,6 +1351,9 @@ void Certifier::garbage_collect() {
         }
         certification_info.erase(it++);
       } else {
+        DBUG_EXECUTE_IF("group_replication_ci_rows_counter_high",
+                        { assert(write_set_counter > 0); });
+        it->second->set_garbage_collect_counter(garbage_collector_counter);
         ++it;
       }
     } /* for loop */
@@ -1408,23 +1381,6 @@ void Certifier::garbage_collect() {
       }
     }
   } /* while loop */
-||||||| 89e1c722476d
-      certification_info.erase(it++);
-    } else
-      ++it;
-  }
-  stable_gtid_set_lock->unlock();
-=======
-      certification_info.erase(it++);
-    } else {
-      DBUG_EXECUTE_IF("group_replication_ci_rows_counter_high",
-                      { assert(write_set_counter > 0); });
-      it->second->set_garbage_collect_counter(garbage_collector_counter);
-      ++it;
-    }
-  }
-  stable_gtid_set_lock->unlock();
->>>>>>> mysql-8.0.41
 
   /* Incrememnt number of garbage collect runs*/
   garbage_collect_runs++;

sql/auth/sql_auth_cache.h

@@ -833,11 +833,6 @@ class Acl_restrictions {
   malloc_unordered_map<std::string, Restrictions> m_restrictions_map;
 };
 
-<<<<<<< HEAD
-extern ACL_USER acl_utility_user;
-
-||||||| 89e1c722476d
-=======
 /**
   Enables preserving temporary account locking attributes during ACL DDL.
   Enables restoring temporary account locking attributes after ACL reload.
@@ -890,5 +885,6 @@ class ACL_temporary_lock_state {
   const long m_daynr_locked;
 };
 
->>>>>>> mysql-8.0.41
+extern ACL_USER acl_utility_user;
+
 #endif /* SQL_USER_CACHE_INCLUDED */

sql/auth/sql_user.cc

@@ -3475,13 +3475,8 @@ bool mysql_alter_user(THD *thd, List<LEX_USER> &list, bool if_exists) {
       return true;
     }
 
-<<<<<<< HEAD
-
-||||||| 89e1c722476d
-=======
     Lock_state_list modified_user_lock_state_list;
 
->>>>>>> mysql-8.0.41
     if (check_system_user_privilege(thd, list)) {
       commit_and_close_mysql_tables(thd);
       return true;

storage/innobase/include/univ.i

@@ -56,7 +56,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH
 
 #ifndef PERCONA_INNODB_VERSION
-#define PERCONA_INNODB_VERSION 31
+#define PERCONA_INNODB_VERSION 32
 #endif
 
 /* The following is the InnoDB version as shown in