PS-9734 merge: Code refresh for 8.0.42-33 (conflicts resolved)

percona-ysorokin · percona-ysorokin · commit 512384aaabbb · 2025-04-28T17:42:08.000+02:00
https://perconadev.atlassian.net/browse/PS-9734
diff --git a/MYSQL_VERSION b/MYSQL_VERSION
@@ -1,13 +1,5 @@
 MYSQL_VERSION_MAJOR=8
 MYSQL_VERSION_MINOR=0
-<<<<<<< HEAD
-MYSQL_VERSION_PATCH=41
-MYSQL_VERSION_EXTRA=-32
-||||||| 14ba93991ba
-MYSQL_VERSION_PATCH=41
-MYSQL_VERSION_EXTRA=
-=======
 MYSQL_VERSION_PATCH=42
-MYSQL_VERSION_EXTRA=
->>>>>>> mysql-8.0.42
+MYSQL_VERSION_EXTRA=-33
 MYSQL_VERSION_STABILITY="LTS"
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -270,6 +270,7 @@ SET(MYSQLBINLOG_LIBRARIES
   binlogevents_static
   client_base
   perconaserverclient
+  extra::unordered_dense
   )
 
 IF(WITH_JSON_BINLOG_LIBRARY)
diff --git a/include/my_sys.h b/include/my_sys.h
@@ -1,11 +1,5 @@
-<<<<<<< HEAD
-/* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
-   Copyright (c) 2018, Percona and/or its affiliates.
-||||||| 14ba93991ba
-/* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
-=======
 /* Copyright (c) 2000, 2025, Oracle and/or its affiliates.
->>>>>>> mysql-8.0.42
+   Copyright (c) 2018, Percona and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
diff --git a/man/mysqldumpslow.1 b/man/mysqldumpslow.1
@@ -2,12 +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/>
-.\"      Date: 03/13/2025
+.\"      Date: 12/13/2024
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLDUMPSLOW" "1" "03/13/2025" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQLDUMPSLOW" "1" "12/13/2024" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -42,15 +42,9 @@ from \fBPercona Toolkit\fR instead (https://www.percona.com/doc/percona-toolkit/
 .SH "COPYRIGHT"
 .br
 .PP
-<<<<<<< HEAD
 Copyright \(co 1997, 2023, Oracle and/or its affiliates.
 .br
 Copyright \(co 2016, Percona Inc.
-||||||| 14ba93991ba
-Copyright \(co 1997, 2024, Oracle and/or its affiliates.
-=======
-Copyright \(co 1997, 2025, Oracle and/or its affiliates.
->>>>>>> mysql-8.0.42
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff --git a/plugin/binlog_utils_udf/CMakeLists.txt b/plugin/binlog_utils_udf/CMakeLists.txt
@@ -1,7 +1,7 @@
 MYSQL_ADD_PLUGIN(binlog_utils_udf
   binlog_utils_udf.cc
   MODULE_ONLY MODULE_OUTPUT_NAME "binlog_utils_udf"
-  LINK_LIBRARIES extra::rapidjson
+  LINK_LIBRARIES extra::rapidjson extra::unordered_dense
 )
 
 set_target_properties(binlog_utils_udf PROPERTIES
diff --git a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc
@@ -54,16 +54,12 @@
 #include <openssl/engine.h>
 #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
 
-<<<<<<< HEAD
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
 #include <openssl/evp.h>
 #include <openssl/provider.h>
 #endif
 
-||||||| 14ba93991ba
-=======
 #include "xcom/retry.h"
->>>>>>> mysql-8.0.42
 #include "xcom/task_debug.h"
 #include "xcom/x_platform.h"
 
diff --git a/scripts/mysqldumpslow.pl.in b/scripts/mysqldumpslow.pl.in
@@ -1,13 +1,7 @@
 #!@PERL_PATH@
 
-<<<<<<< HEAD
 # Copyright (c) 2000, 2024, Oracle and/or its affiliates.
 # Copyright (c) 2016, Percona Inc.
-||||||| 14ba93991ba
-# Copyright (c) 2000, 2024, Oracle and/or its affiliates.
-=======
-# Copyright (c) 2000, 2025, Oracle and/or its affiliates.
->>>>>>> mysql-8.0.42
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
diff --git a/sql/rpl_trx_tracking.h b/sql/rpl_trx_tracking.h
@@ -164,16 +164,8 @@ class Writeset_trx_dependency_tracker {
     Track the last transaction sequence number that changed each row
     in the database, using row hashes from the writeset as the index.
   */
-<<<<<<< HEAD
-  typedef std::map<uint64, int64> Writeset_history;
-  std::shared_ptr<Writeset_history> m_writeset_history;
-||||||| 14ba93991ba
-  typedef std::map<uint64, int64> Writeset_history;
-  Writeset_history m_writeset_history;
-=======
   using Writeset_history = ankerl::unordered_dense::map<uint64, int64>;
-  Writeset_history m_writeset_history;
->>>>>>> mysql-8.0.42
+  std::shared_ptr<Writeset_history> m_writeset_history;
 };
 
 /**
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
@@ -8906,7 +8906,6 @@ static bool create_table_impl(
   DBUG_PRINT("enter", ("db: '%s'  table: '%s'  tmp: %d", db, table_name,
                        internal_tmp_table));
 
-<<<<<<< HEAD
   // Check that we have at least one visible column.
   bool has_visible_column = false;
   for (const Create_field &create_field : alter_info->create_list) {
@@ -8920,25 +8919,8 @@ static bool create_table_impl(
     return true;
   }
 
-  if (check_engine(thd, db, table_name, create_info, alter_info)) return true;
-||||||| 14ba93991ba
-  // Check that we have at least one visible column.
-  bool has_visible_column = false;
-  for (const Create_field &create_field : alter_info->create_list) {
-    if (create_field.hidden == dd::Column::enum_hidden_type::HT_VISIBLE) {
-      has_visible_column = true;
-      break;
-    }
-  }
-  if (!has_visible_column) {
-    my_error(ER_TABLE_MUST_HAVE_A_VISIBLE_COLUMN, MYF(0));
+  if (check_engine(thd, db, table_name, create_info, alter_info))
     return true;
-  }
-
-  if (check_engine(db, table_name, create_info)) return true;
-=======
-  if (check_engine(db, table_name, create_info)) return true;
->>>>>>> mysql-8.0.42
 
   // Secondary engine cannot be defined for temporary tables.
   if (create_info->secondary_engine.str != nullptr &&
diff --git a/storage/blackhole/CMakeLists.txt b/storage/blackhole/CMakeLists.txt
@@ -23,7 +23,7 @@
 
 MYSQL_ADD_PLUGIN(blackhole ha_blackhole.cc
   DEFAULT_LEGACY_ENGINE STORAGE_ENGINE
-  LINK_LIBRARIES extra::rapidjson ext::zlib
+  LINK_LIBRARIES extra::rapidjson ext::zlib extra::unordered_dense
   )
 # Exclude blackhole from PGO on Windows to avoid linker error LNK1248
 EXCLUDE_FROM_MSVC_PGO(blackhole)
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
@@ -1239,31 +1239,12 @@ static void buf_assert_all_are_replaceable(buf_chunk_t *chunk) {
         break;
       case BUF_BLOCK_FILE_PAGE:
         buf_page_mutex_enter(block);
-<<<<<<< HEAD
-        auto ready = buf_flush_ready_for_replace(&block->page);
-        buf_page_mutex_exit(block);
-
-        if (UNIV_UNLIKELY(block->page.is_corrupt)) {
-          /* corrupt page may remain, it can be
-          skipped */
-          break;
-        }
-
-        if (!ready) {
-          return (block);
-||||||| 14ba93991ba
-        auto ready = buf_flush_ready_for_replace(&block->page);
-        buf_page_mutex_exit(block);
-
-        if (!ready) {
-          return (block);
-=======
         const auto &bpage = block->page;
-        if (!buf_flush_ready_for_replace(&bpage) ||
+        /* corrupt page may remain, it can be skipped */
+        if ((!bpage.is_corrupt && !buf_flush_ready_for_replace(&bpage)) ||
             DBUG_EVALUATE_IF("simulate_dirty_page_at_shutdown", true, false)) {
           ib::fatal(UT_LOCATION_HERE, ER_IB_ERR_PAGE_DIRTY_AT_SHUTDOWN)
               << *block;
->>>>>>> mysql-8.0.42
         }
         buf_page_mutex_exit(block);
         break;
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
@@ -5615,7 +5615,6 @@ bool ha_innobase::prepare_inplace_alter_table_impl(
     goto err_exit_no_heap;
   }
 
-<<<<<<< HEAD
   /* create_table_info_t::innobase_table_flags does not set encryption
   flags. There are places where it is done afterwards, there are places
   where it isn't done. We need to inspect all code paths and check if
@@ -5636,12 +5635,7 @@ bool ha_innobase::prepare_inplace_alter_table_impl(
     }
   }
 
-  max_col_len = DICT_MAX_FIELD_LEN_BY_FORMAT_FLAG(info.flags());
-||||||| 14ba93991ba
-  max_col_len = DICT_MAX_FIELD_LEN_BY_FORMAT_FLAG(info.flags());
-=======
   const uint32_t max_col_len = DICT_MAX_FIELD_LEN_BY_FORMAT_FLAG(info.flags());
->>>>>>> mysql-8.0.42
 
   /* Check each index's column length to make sure they do not
   exceed limit */
diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
@@ -39,17 +39,14 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <sql_time.h>
 #include <sys/types.h>
 #include <time.h>
-<<<<<<< HEAD
+#include <string_view>
+#include <unordered_map>
+
 #include "sql/debug_sync.h"
 #include "sql/item.h"
 #include "sql/item_cmpfunc.h"
 #include "sql/item_func.h"
 #include "sql/item_sum.h"
-||||||| 14ba93991ba
-=======
-#include <string_view>
-#include <unordered_map>
->>>>>>> mysql-8.0.42
 
 #include "auth_acls.h"
 #include "btr0btr.h"
diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h
@@ -814,35 +814,24 @@ null-terminated string
 @param[in]      fd              file descriptor to alter
 @param[in]      file_name       file name, used in the diagnostic message
 @param[in]      operation_name  "open" or "create"; used in the diagnostic
-<<<<<<< HEAD
                                 message
+@param[in]      on_error_silent if true then don't print any message to the log
 @return true if operation is success and false */
 bool os_file_set_nocache(int fd, const char *file_name,
-                         const char *operation_name);
+                         const char *operation_name,
+                         bool on_error_silent = false);
 
 /** Tries to disable OS caching on an opened file file.
-@param[in]	file		file to alter
-@param[in]	file_name	file name, used in the diagnostic message
-@param[in]	name		"open" or "create"; used in the diagnostic
-message
+@param[in]	    file		        file to alter
+@param[in]	    file_name	      file name, used in the diagnostic message
+@param[in]	    name		        "open" or "create"; used in the diagnostic
+                                message
+@param[in]      on_error_silent if true then don't print any message to the log
 @return true if operation is success and false */
 static inline bool os_file_set_nocache(pfs_os_file_t file,
                                        const char *file_name,
-                                       const char *operation_name);
-
-||||||| 14ba93991ba
-                                message */
-void os_file_set_nocache(int fd, const char *file_name,
-                         const char *operation_name);
-
-=======
-                                message
-@param[in]      on_error_silent if true then don't print any message to the log
-*/
-void os_file_set_nocache(int fd, const char *file_name,
-                         const char *operation_name,
-                         bool on_error_silent = false);
->>>>>>> mysql-8.0.42
+                                       const char *operation_name,
+                                       bool on_error_silent = false);
 /** NOTE! Use the corresponding macro os_file_create(), not directly
 this function!
 Opens an existing file or creates a new.
diff --git a/storage/innobase/include/os0file.ic b/storage/innobase/include/os0file.ic
@@ -526,12 +526,15 @@ static inline bool pfs_os_file_set_eof_at_func(pfs_os_file_t file, uint64_t new_
 #endif /* UNIV_PFS_IO */
 
 /** Tries to disable OS caching on an opened file file.
-@param[in]	file		file to alter
-@param[in]	file_name	file name, used in the diagnostic message
-@param[in]	name		"open" or "create"; used in the diagnostic
-message
+@param[in]	file		        file to alter
+@param[in]	file_name	      file name, used in the diagnostic message
+@param[in]	name		        "open" or "create"; used in the diagnostic
+                            message
+@param[in]  on_error_silent if true then don't print any message to the log
 @return true if operation is success and false */
 static inline bool os_file_set_nocache(pfs_os_file_t file, const char *file_name,
-                                       const char *operation_name) {
-  return os_file_set_nocache(file.m_file, file_name, operation_name);
+                                       const char *operation_name,
+                                       bool on_error_silent) {
+  return os_file_set_nocache(file.m_file, file_name, operation_name,
+                             on_error_silent);
 }
diff --git a/storage/innobase/include/univ.i b/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 32
+#define PERCONA_INNODB_VERSION 33
 #endif
 
 /* The following is the InnoDB version as shown in
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
@@ -3385,19 +3385,10 @@ pfs_os_file_t os_file_create_func(const char *name, ulint create_mode,
 
   } while (retry);
 
-<<<<<<< HEAD
-  /* Do fsync() on log and parallel doublewrite files
-  when setting O_DIRECT fails.
-  See log_io_complete() and buf_dblwr_flush_buffered_writes() */
-||||||| 14ba93991ba
-  /* We disable OS caching (O_DIRECT) only on data files. For clone we
-  need to set O_DIRECT even for read_only mode. */
-=======
   if (!*success) {
     ut_a(file.m_file == OS_FILE_CLOSED);
     return file;
   }
->>>>>>> mysql-8.0.42
 
   bool use_odirect = false;
 
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
@@ -3020,15 +3020,7 @@ static lsn_t srv_shutdown_log() {
     auto err = fil_write_flushed_lsn(lsn);
     ut_a(err == DB_SUCCESS);
   }
-<<<<<<< HEAD
-  buf_must_be_all_freed();
-||||||| 14ba93991ba
-
-  buf_must_be_all_freed();
-=======
-
   buf_assert_all_are_replaceable();
->>>>>>> mysql-8.0.42
   ut_a(lsn == log_get_lsn(*log_sys));
 
   if (srv_downgrade_logs) {
diff --git a/storage/myisam/mi_cache.cc b/storage/myisam/mi_cache.cc
@@ -1,11 +1,5 @@
-<<<<<<< HEAD
-/* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
-   Copyright (c) 2018, Percona and/or its affiliates.
-||||||| 14ba93991ba
-/* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
-=======
 /* Copyright (c) 2000, 2025, Oracle and/or its affiliates.
->>>>>>> mysql-8.0.42
+   Copyright (c) 2018, Percona and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
diff --git a/storage/myisam/sort.cc b/storage/myisam/sort.cc
@@ -1,11 +1,5 @@
-<<<<<<< HEAD
-/* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
-   Copyright (c) 2018, Percona and/or its affiliates.
-||||||| 14ba93991ba
-/* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
-=======
 /* Copyright (c) 2000, 2025, Oracle and/or its affiliates.
->>>>>>> mysql-8.0.42
+   Copyright (c) 2018, Percona and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
diff --git a/storage/rocksdb/rdb_index_merge.cc b/storage/rocksdb/rdb_index_merge.cc
@@ -17,6 +17,8 @@
 /* This C++ file's header file */
 #include "./rdb_index_merge.h"
 
+#include <cinttypes>
+
 #include "rdb_utils.h"  // LOG_COMPONENT_TAG for includes below
 
 /* MySQL header files */

Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,7 @@ SET(MYSQLBINLOG_LIBRARIES`
`270`	`270`	`binlogevents_static`
`271`	`271`	`client_base`
`272`	`272`	`perconaserverclient`
	`273`	`+ extra::unordered_dense`
`273`	`274`	`)`
`274`	`275`
`275`	`276`	`IF(WITH_JSON_BINLOG_LIBRARY)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`MYSQL_ADD_PLUGIN(binlog_utils_udf`
`2`	`2`	`binlog_utils_udf.cc`
`3`	`3`	`MODULE_ONLY MODULE_OUTPUT_NAME "binlog_utils_udf"`
`4`		`- LINK_LIBRARIES extra::rapidjson`
	`4`	`+ LINK_LIBRARIES extra::rapidjson extra::unordered_dense`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`set_target_properties(binlog_utils_udf PROPERTIES`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`MYSQL_ADD_PLUGIN(blackhole ha_blackhole.cc`
`25`	`25`	`DEFAULT_LEGACY_ENGINE STORAGE_ENGINE`
`26`		`- LINK_LIBRARIES extra::rapidjson ext::zlib`
	`26`	`+ LINK_LIBRARIES extra::rapidjson ext::zlib extra::unordered_dense`
`27`	`27`	`)`
`28`	`28`	`# Exclude blackhole from PGO on Windows to avoid linker error LNK1248`
`29`	`29`	`EXCLUDE_FROM_MSVC_PGO(blackhole)`