PXB-3240: Merge 8.4

Conflict resolutions:

components/keyrings/keyring_file/config/config.cc
63c18bd defined error message, pxb added macro check under that code

include/sql_common.h
cd3a00d introduced MYSQL_FIELD, pxb added || defined(XTRABACKUP) to if clause

storage/innobase/log/log0recv.cc
4e3b4d6 added recv_sys_parse_byte_by_byte() and call it before recv_sys_add_to_parsing_buf if defined(UNIV_DEBUG) && defined(HAVE_ASAN),
pxb passes `data_len` to  recv_sys_add_to_parsing_buf()
6491b57 changed recv_recovery_begin() return type from void to dberr_t , pxb added to_lsn parameter
6491b57 returns error if recv_recovery_begin() was not successful, pxb added to_lsn parameter

storage/innobase/log/log0log.cc
50d1020 moved log_file_header_check_flag() check upwards, pxb set the xb_log_detected_format

sql/derror.cc
4fd93f7 removed previously deprecated option --language and its supporting code.

sql/mysqld.cc
3ae8d8e Removed the --ssl and --admin-ssl options.

storage/innobase/fsp/fsp0file.cc
2bd5d7b added debug_assertion for checking file handle open

storage/innobase/fil/fil0fil.cc
4e3b4d6 introduced parse_path_from_redo() which lead to changes in fil_tablespace_redo_ functions

storage/innobase/xtrabackup/src/xtrabackup.cc
2cb1bd0 introduced signal_handler.h and use 'sa_sigaction' rather than 'sa_handler' for catching fatal signals.
5e4407d `os_file_set_umask()` is modified so it can be called only once , I removed "os_innodb_umask = (ulint)0664; os_file_set_umask(my_umask);"

storage/innobase/include/os0file.h
I removed "extern ulint os_innodb_umask;"  somehow it was not removed by merge

storage/innobase/xtrabackup/src/backup_mysql.cc
fix SQL syntax

deleted by them: plugin/keyring/buffered_file_io.cc
deleted by them: plugin/keyring/buffered_file_io.h
deleted by them: plugin/keyring/keyring.cc
deleted by them: unittest/gunit/keyring/CMakeLists.txt
deleted by them: unittest/gunit/keyring/keyring-api-t.cc

Fix tests:

main.all_files
As part of the installation process, a file in JSON format named mysql_upgrade_history is now created in the server's data directory,
or updated if it already exists.

main.bug1630841:
default_authentication_plugin: Deprecated in MySQL 8.0.27, and now removed. Use authentication_policy instead.

main.user_management , main.version_check :
The deprecated mysql_native_password authentication plugin is now disabled by default.

keyring_*.sh
replaced keyring file plugin with keyring component

bug1037379.sh - fix offensive SQL syntax
bug1630841.sh - replace `default-authentication-plugin` with `authentication-policy`
all_files.sh - move `./mysql_upgrade_history` above `./mysqld1.err` for inc backup
xb_duplicate_sdi.sh - edit common.sh, copy `instance_local_manifest` only if keyring is used

Removed old boost dir extra/boost/boost_1_77_0
Added new boost files required for uuid headers:
extra/boost/boost_1_84_0/boost/io_fwd.hpp
extra/boost/boost_1_84_0/boost/random/
extra/boost/boost_1_84_0/boost/tti/
extra/boost/boost_1_84_0/boost/uuid/

XB_VERSION

@@ -1,4 +1,4 @@
 XB_VERSION_MAJOR=8
-XB_VERSION_MINOR=3
+XB_VERSION_MINOR=4
 XB_VERSION_PATCH=0
 XB_VERSION_EXTRA=-1

client/include/authentication_webauthn_clientopt-case.h

@@ -21,68 +21,12 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
 
-<<<<<<< HEAD:unittest/gunit/keyring/mock_logger.h
-#ifndef MOCK_LOGGER_H
-#define MOCK_LOGGER_H
-||||||| 824e2b40640:unittest/gunit/keyring/mock_logger.h
-#ifndef MOCKLOGGER_H
-#define MOCKLOGGER_H
-=======
 #ifndef AUTHENTICATION_WEBAUTHN_CLIENTOPT_CASE_H
 #define AUTHENTICATION_WEBAUTHN_CLIENTOPT_CASE_H
->>>>>>> mysql-8.4.0:client/include/authentication_webauthn_clientopt-case.h
 
 case OPT_AUTHENTICATION_WEBAUTHN_CLIENT_PRESERVE_PRIVACY:
  opt_authentication_webauthn_client_preserve_privacy =
  (argument != disabled_my_option);
  break;
 
-<<<<<<< HEAD:unittest/gunit/keyring/mock_logger.h
-#include <sql/derror.h>
-#include "plugin/keyring/common/logger.h"
-
-namespace keyring {
-class Mock_logger : public ILogger {
- public:
- MOCK_METHOD2(log, void(longlong level, const char *msg));
-
- void log(longlong level, longlong errcode, ...) override {
- char buf[LOG_BUFF_MAX];
- const char *fmt = error_message_for_error_log(errcode);
-
- va_list vl;
- va_start(vl, errcode);
- vsnprintf(buf, LOG_BUFF_MAX - 1, fmt, vl);
- va_end(vl);
-
- log(level, buf);
- }
-};
-} // namespace keyring
-#endif // MOCK_LOGGER_H
-||||||| 824e2b40640:unittest/gunit/keyring/mock_logger.h
-#include <sql/derror.h>
-#include "plugin/keyring/common/logger.h"
-
-namespace keyring {
-class Mock_logger : public ILogger {
- public:
- MOCK_METHOD2(log, void(longlong level, const char *msg));
-
- void log(longlong level, longlong errcode, ...) override {
- char buf[LOG_BUFF_MAX];
- const char *fmt = error_message_for_error_log(errcode);
-
- va_list vl;
- va_start(vl, errcode);
- vsnprintf(buf, LOG_BUFF_MAX - 1, fmt, vl);
- va_end(vl);
-
- log(level, buf);
- }
-};
-} // namespace keyring
-#endif // MOCKLOGGER_H
-=======
 #endif /* AUTHENTICATION_WEBAUTHN_CLIENTOPT_CASE_H */
->>>>>>> mysql-8.4.0:client/include/authentication_webauthn_clientopt-case.h

client/include/sslopt-case.h

@@ -21,22 +21,11 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
 
-<<<<<<< HEAD:include/sslopt-case.h
 /**
  @file include/sslopt-case.h
 */
 
-
 #if defined(MYSQL_SERVER) && !defined(XTRABACKUP)
-||||||| 824e2b40640:include/sslopt-case.h
-/**
- @file include/sslopt-case.h
-*/
-
-#ifdef MYSQL_SERVER
-=======
-#ifdef MYSQL_SERVER
->>>>>>> mysql-8.4.0:client/include/sslopt-case.h
 #error This header is supposed to be used only in the client
 #endif
 

client/include/sslopt-longopts.h

@@ -25,12 +25,6 @@
  @file include/sslopt-longopts.h
 */
 
-<<<<<<< HEAD:include/sslopt-longopts.h
-#if !defined(MYSQL_SERVER) || defined(XTRABACKUP)
-||||||| 824e2b40640:include/sslopt-longopts.h
-#ifndef MYSQL_SERVER
-=======
->>>>>>> mysql-8.4.0:client/include/sslopt-longopts.h
 {"ssl-mode",
  OPT_SSL_MODE,
  "SSL connection mode.",

cmake/mysql_version.cmake

@@ -63,13 +63,7 @@ MACRO(GET_MYSQL_VERSION)
  MESSAGE(FATAL_ERROR "MYSQL_VERSION file cannot be parsed.")
  ENDIF()
 
-<<<<<<< HEAD
- MYSQL_GET_CONFIG_VALUE("MYSQL_VERSION_STABILITY" MYSQL_VERSION_STABILITY MYSQL_VERSION)
-||||||| 824e2b40640
- MYSQL_GET_CONFIG_VALUE("MYSQL_VERSION_STABILITY" MYSQL_VERSION_STABILITY)
-=======
- MYSQL_GET_CONFIG_VALUE("MYSQL_VERSION_MATURITY" MYSQL_VERSION_MATURITY)
->>>>>>> mysql-8.4.0
+ MYSQL_GET_CONFIG_VALUE("MYSQL_VERSION_MATURITY" MYSQL_VERSION_MATURITY MYSQL_VERSION)
 
  IF(NOT DEFINED MYSQL_VERSION_MATURITY)
  MESSAGE(FATAL_ERROR "MYSQL_VERSION file cannot be parsed, missing version attributes.")

components/keyrings/keyring_file/config/config.cc

@@ -89,21 +89,13 @@ bool find_and_read_config_file(std::unique_ptr<Config_pod> &config_pod,
  full_path.append(config_file_name);
  return false;
  };
-<<<<<<< HEAD
- if (set_config_path(path) == true) return true;
-#ifdef XTRABACKUP
- path = xtrabackup::components::component_config_path;
-#endif
-||||||| 824e2b40640
- if (set_config_path(path) == true) return true;
-
-=======
  if (set_config_path(path) == true) {
  err = "Failed to set path to configuration file";
  return true;
  }
-
->>>>>>> mysql-8.4.0
+#ifdef XTRABACKUP
+ path = xtrabackup::components::component_config_path;
+#endif
  /* Read config file that's located at shared library location */
  std::unique_ptr<Config_reader> config_reader(new (std::nothrow)
  Config_reader(path));

components/test/statement_services/CMakeLists.txt

@@ -23,52 +23,8 @@
 
 DISABLE_MISSING_PROFILE_WARNING()
 
-<<<<<<< HEAD:plugin/keyring/CMakeLists.txt
 INCLUDE_DIRECTORIES(SYSTEM ${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
 
-MYSQL_ADD_PLUGIN(keyring_file
- buffer.cc
- buffered_file_io.cc
- checker/checker.cc
- checker/checker_factory.cc
- checker/checker_ver_1_0.cc
- checker/checker_ver_2_0.cc
- common/keyring_impl.cc
- common/keyring_key.cc
- common/keys_container.cc
- common/keys_iterator.cc
- common/keyring_impl.cc
- converter.cc
- digest.cc
- file_io.cc
- hash_to_buffer_serializer.cc
- keyring.cc
- LINK_LIBRARIES OpenSSL::SSL OpenSSL::Crypto
- MODULE_ONLY
- MODULE_OUTPUT_NAME "keyring_file"
- )
-||||||| 824e2b40640:plugin/keyring/CMakeLists.txt
-MYSQL_ADD_PLUGIN(keyring_file
- buffer.cc
- buffered_file_io.cc
- checker/checker.cc
- checker/checker_factory.cc
- checker/checker_ver_1_0.cc
- checker/checker_ver_2_0.cc
- common/keyring_impl.cc
- common/keyring_key.cc
- common/keys_container.cc
- common/keys_iterator.cc
- converter.cc
- digest.cc
- file_io.cc
- hash_to_buffer_serializer.cc
- keyring.cc
- LINK_LIBRARIES OpenSSL::SSL OpenSSL::Crypto
- MODULE_ONLY
- MODULE_OUTPUT_NAME "keyring_file"
- )
-=======
 MYSQL_ADD_COMPONENT(test_execute_regular_statement
  test_execute_regular_statement.cc
  utils.cc
@@ -82,4 +38,3 @@ MYSQL_ADD_COMPONENT(test_execute_prepared_statement
  MODULE_ONLY
  TEST_ONLY
 )
->>>>>>> mysql-8.4.0:components/test/statement_services/CMakeLists.txt